diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/TravelinfoController.php b/public/typo3conf/ext/ep_products/Classes/Controller/TravelinfoController.php
index 2d816237..4f06f783 100644
--- a/public/typo3conf/ext/ep_products/Classes/Controller/TravelinfoController.php
+++ b/public/typo3conf/ext/ep_products/Classes/Controller/TravelinfoController.php
@@ -84,8 +84,8 @@ class TravelinfoController extends ActionController
         $service = array_filter($travelData['transportationServices'] ?? [], function ($service) {
             return 'BUS' === $service['subType'] && 'RUECK' === $service['direction'];
         });
-        if (null !== $service[0] ?? null) {
-            $departureDayTime = $service[0]['dayTime'];
+        if ($serviceDetail = reset($service)) {
+            $departureDayTime = $serviceDetail['dayTime'];
         }
 
         $this->view->assign('travelInfo', $travelInfo);
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Travelinfo.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Travelinfo.html
index 6bdeeac9..5dd3cf9e 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Travelinfo.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Travelinfo.html
@@ -44,7 +44,7 @@
                     {travelInfo.headline}
                 </h1>
                 {travelInfo.introText -> f:format.html()}
-                <f:if condition="{date}">
+                <f:if condition="{travelData}">
                     <p>
                         {travelData.label} {travelData.dateFrom -> f:format.date(format: 'd.m.Y')} - {travelData.dateTo -> f:format.date(format: 'd.m.Y')}
                     </p>
@@ -62,7 +62,7 @@
                     </div>
                 </div>
                 <div class="lg:w-3/4 pt-8 lg:pt-0 lg:px-8 text-white" data-rte-content>
-                    <f:if condition="{date}">
+                    <f:if condition="{travelData}">
                         <f:if condition="{travelInfo.hideAddress}">
                             <f:else>
                                 <h3 class="text-white">