diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxCalendar/Range.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxCalendar/Range.html
index 793d5015..ece952c7 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxCalendar/Range.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxCalendar/Range.html
@@ -16,21 +16,7 @@
     <f:section name="Year">
         <f:for each="{year}" as="month">
             <ep:calendar.includes range="{range}" period="{month}">
-                <f:if condition="{hotel.groupsPriceConfigs}">
-                    <f:then>
-                        <div data-controller="lightbox"
-                             data-lightbox-url-value="{f:uri.action(action: 'index', controller: 'GroupsPrice', arguments: '{hotel: hotel}', pageUid: settings.groupsPricePopupPageUid, absolute: 1)}"
-                             data-lightbox-type-value="external"
-                             data-lightbox-height-value="85vh"
-                             data-action="click->lightbox#open"
-                             class="cursor-pointer">
-                            <f:render section="Calendar" arguments="{_all}"/>
-                        </div>
-                    </f:then>
-                    <f:else>
-                        <f:render section="Calendar" arguments="{_all}"/>
-                    </f:else>
-                </f:if>
+                <f:render section="Calendar" arguments="{_all}"/>
             </ep:calendar.includes>
         </f:for>
     </f:section>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
index ad756b44..c8b7b8d3 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
@@ -353,8 +353,21 @@
                             data-calendar-target="field"
                             data-action="calendar#select">
                     </select>
-                    <div class="mt-4"
-                         data-calendar-target="container"></div>
+                    <f:if condition="{hotel.groupsPriceConfigs}">
+                        <f:then>
+                            <div class="mt-4 cursor-pointer"
+                                 data-controller="lightbox"
+                                 data-lightbox-url-value="{f:uri.action(action: 'index', controller: 'GroupsPrice', arguments: '{hotel: hotel}', pageUid: settings.groupsPricePopupPageUid, absolute: 1)}"
+                                 data-lightbox-type-value="external"
+                                 data-lightbox-height-value="85vh"
+                                 data-action="click->lightbox#open"
+                                 data-calendar-target="container"></div>
+                        </f:then>
+                        <f:else>
+                            <div class="mt-4"
+                                 data-calendar-target="container"></div>
+                        </f:else>
+                    </f:if>
                     <div class="absolute top-0 left-0 inset-0 w-full h-full bg-white/85"
                          data-calendar-target="loadingIndicator">
                         <f:image class="absolute top-1/2 left-1/2 -translate-xy-1/2" src="EXT:ep_theme/Resources/Public/images/ajax-loader-white.gif" alt="Loading"/>