diff --git a/trunk/src/AppBundle/Controller/AdminController.php b/trunk/src/AppBundle/Controller/AdminController.php
index f815740a..a69c1fb9 100644
--- a/trunk/src/AppBundle/Controller/AdminController.php
+++ b/trunk/src/AppBundle/Controller/AdminController.php
@@ -165,11 +165,13 @@ class AdminController extends Controller
         $reservations = $calendarUtil->getReservations($lodging);
 
 
-
         $paddedCalendar = $calendarUtil->getCalendarWithPadding();
         $calendar = $calendarUtil->getCalendar();
-        $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
-        $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
+        if (count($lodging->getPrices()->toArray()) != 0)
+        {
+            $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
+            $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
+        }
 
         $form = $this->createForm(FewoLodgingType::class, $lodging, [
             //options
@@ -231,8 +233,11 @@ class AdminController extends Controller
 
         $paddedCalendar = $calendarUtil->getCalendarWithPadding();
         $calendar = $calendarUtil->getCalendar();
-        $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
-        $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
+        if (count($lodging->getPrices()->toArray()) != 0)
+        {
+            $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
+            $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
+        }
 
 
         return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [