diff --git a/trunk/src/AppBundle/Controller/AdminController.php b/trunk/src/AppBundle/Controller/AdminController.php
index a69c1fb9..c25b34dc 100644
--- a/trunk/src/AppBundle/Controller/AdminController.php
+++ b/trunk/src/AppBundle/Controller/AdminController.php
@@ -171,6 +171,8 @@ class AdminController extends Controller
         {
             $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
             $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
+        } else {
+            $calendar = $paddedCalendar;
         }
 
         $form = $this->createForm(FewoLodgingType::class, $lodging, [
@@ -237,9 +239,10 @@ class AdminController extends Controller
         {
             $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
             $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
+        } else {
+            $calendar = $paddedCalendar;
         }
 
-
         return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [
             'fewo_lodging' => $lodging,
             'calendar' => $calendar
diff --git a/trunk/src/AppBundle/Controller/CmsController.php b/trunk/src/AppBundle/Controller/CmsController.php
index e850a9f6..ad91c79f 100644
--- a/trunk/src/AppBundle/Controller/CmsController.php
+++ b/trunk/src/AppBundle/Controller/CmsController.php
@@ -132,9 +132,13 @@ class CmsController 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);
+        } else {
+            $calendar = $paddedCalendar;
+        }
 
         return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [
             'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,