diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
index 5a5e89ea..2e4077b0 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
@@ -5,9 +5,11 @@
             <div class="slider__item">
                 <div class="herounit">
                     <f:alias map="{image: slide.image.0}">
-                        <div class="herounit__image responsive-bg" style="background-image: url({f:uri.image(image: image, height: '240')})"
-                             data-mobile="{f:uri.image(image: image, height: '240')}"
-                             data-desktop="{f:uri.image(image: image, width: '1370')}"></div>
+                        <f:if condition="{image}">
+                            <div class="herounit__image responsive-bg" style="background-image: url({f:uri.image(image: image, height: '240')})"
+                                 data-mobile="{f:uri.image(image: image, height: '240')}"
+                                 data-desktop="{f:uri.image(image: image, width: '1370')}"></div>
+                        </f:if>
                     </f:alias>
                     <div class="herounit__main">
                         <div class="herounit__inner">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html
index 9277e06f..679cb713 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html
@@ -1,55 +1,57 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 {slides -> v:iterator.first() -> v:variable.set(name: 'slide')}
-<div class="pagehead">
-    <f:alias map="{image: slide.image.0}">
-        <div class="pagehead__image responsive-bg"
-             style="background-image: url({f:uri.image(image: image, height: '240')})"
-             data-mobile="{f:uri.image(image: image, height: '240')}"
-             data-desktop="{f:uri.image(image: image, width: '1370')}"></div>
-    </f:alias>
-    <div class="pagehead__main">
-        <div class="pagehead__inner">
-            <div class="header-caption">
-                <div class="header-caption__inner header-caption__inner--small">
-                    <div class="header-caption__text">
-                        <span>{slide.headline}</span><br>{slide.subline}
-                    </div>
-                    <f:if condition="{slide.button}">
-                        <f:link.typolink parameter="{slide.page_uid}" class="button header-caption__button">{slide.button}</f:link.typolink>
-                    </f:if>
-                </div>
-            </div>
-            <f:if condition="{slide.button}">
-                <f:link.typolink parameter="{slide.page_uid}" class="button header__button">{slide.button}</f:link.typolink>
-            </f:if>
-        </div>
-    </div>
-    <f:if condition="{settings.showSkipassBadge}">
-        <f:link.typolink parameter="{settings.skipassPageUid}" title="Skipass inklusive">
-            <f:image src="EXT:ep_theme/Resources/Public/images/badge_skipass.png" alt="Skipass inklusive"
-                     class="pagehead__badge pagehead__badge--skipass" />
-        </f:link.typolink>
-    </f:if>
-    <f:if condition="{badge}">
-        <f:alias map="{badgeData: badge.0.data}">
-            <f:link.typolink parameter="{badgeData.link}" title="{badgeData.title}">
-                <div class="pagehead__badge pagehead__badge--custom custom-badge">
-                    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet"
-                         viewBox="0 0 200 200" class="custom-badge__background">
-                        <g>
-                            <circle id="bgouter" cx="100" cy="100" r="100"></circle>
-                            <circle id="bginner" cx="100" cy="100" r="70"></circle>
-                        </g>
-                    </svg>
-                    <div class="custom-badge__content">
-                        <span class="custom-badge__title">{badgeData.title -> f:format.raw()}</span>
-                        <span class="custom-badge__subtitle">{badgeData.subtitle -> f:format.raw()}</span>
-                    </div>
-                </div>
-            </f:link.typolink>
+<f:if condition="{slide}">
+    <div class="pagehead">
+        <f:alias map="{image: slide.image.0}">
+            <div class="pagehead__image responsive-bg"
+                 style="background-image: url({f:uri.image(image: image, height: '240')})"
+                 data-mobile="{f:uri.image(image: image, height: '240')}"
+                 data-desktop="{f:uri.image(image: image, width: '1370')}"></div>
         </f:alias>
-    </f:if>
-    <f:if condition="{slide.image.0.description}">
-        <div class="pagehead__picturecredit">{slide.image.0.description -> f:format.htmlspecialchars()}</div>
-    </f:if>
-</div>
+        <div class="pagehead__main">
+            <div class="pagehead__inner">
+                <div class="header-caption">
+                    <div class="header-caption__inner header-caption__inner--small">
+                        <div class="header-caption__text">
+                            <span>{slide.headline}</span><br>{slide.subline}
+                        </div>
+                        <f:if condition="{slide.button}">
+                            <f:link.typolink parameter="{slide.page_uid}" class="button header-caption__button">{slide.button}</f:link.typolink>
+                        </f:if>
+                    </div>
+                </div>
+                <f:if condition="{slide.button}">
+                    <f:link.typolink parameter="{slide.page_uid}" class="button header__button">{slide.button}</f:link.typolink>
+                </f:if>
+            </div>
+        </div>
+        <f:if condition="{settings.showSkipassBadge}">
+            <f:link.typolink parameter="{settings.skipassPageUid}" title="Skipass inklusive">
+                <f:image src="EXT:ep_theme/Resources/Public/images/badge_skipass.png" alt="Skipass inklusive"
+                         class="pagehead__badge pagehead__badge--skipass" />
+            </f:link.typolink>
+        </f:if>
+        <f:if condition="{badge}">
+            <f:alias map="{badgeData: badge.0.data}">
+                <f:link.typolink parameter="{badgeData.link}" title="{badgeData.title}">
+                    <div class="pagehead__badge pagehead__badge--custom custom-badge">
+                        <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet"
+                             viewBox="0 0 200 200" class="custom-badge__background">
+                            <g>
+                                <circle id="bgouter" cx="100" cy="100" r="100"></circle>
+                                <circle id="bginner" cx="100" cy="100" r="70"></circle>
+                            </g>
+                        </svg>
+                        <div class="custom-badge__content">
+                            <span class="custom-badge__title">{badgeData.title -> f:format.raw()}</span>
+                            <span class="custom-badge__subtitle">{badgeData.subtitle -> f:format.raw()}</span>
+                        </div>
+                    </div>
+                </f:link.typolink>
+            </f:alias>
+        </f:if>
+        <f:if condition="{slide.image.0.description}">
+            <div class="pagehead__picturecredit">{slide.image.0.description -> f:format.htmlspecialchars()}</div>
+        </f:if>
+    </div>
+</f:if>