diff --git a/Neos.Media/Classes/Eel/ImageHelper.php b/Neos.Media/Classes/Eel/ImageHelper.php
index 40092bd8f7c..b99ca2d36ad 100644
--- a/Neos.Media/Classes/Eel/ImageHelper.php
+++ b/Neos.Media/Classes/Eel/ImageHelper.php
@@ -41,7 +41,7 @@ class ImageHelper implements ProtectedContextAwareInterface
      * @throws ThumbnailServiceException
      */
     public function createThumbnail(
-        AssetInterface $asset,
+        ?AssetInterface $asset,
         string $preset = null,
         int $width = null,
         int $maximumWidth = null,
@@ -53,6 +53,9 @@ public function createThumbnail(
         int $quality = null,
         string $format = null
     ): ?ImageInterface {
+        if (!$asset instanceof AssetInterface) {
+            return null;
+        }
         if (!empty($preset)) {
             $thumbnailConfiguration = $this->thumbnailService->getThumbnailConfigurationForPreset($preset);
         } else {
diff --git a/Neos.Neos/Resources/Private/Fusion/Prototypes/ImageTag.fusion b/Neos.Neos/Resources/Private/Fusion/Prototypes/ImageTag.fusion
index 063a2423867..84bb97c8f7f 100644
--- a/Neos.Neos/Resources/Private/Fusion/Prototypes/ImageTag.fusion
+++ b/Neos.Neos/Resources/Private/Fusion/Prototypes/ImageTag.fusion
@@ -10,7 +10,7 @@ prototype(Neos.Neos:ImageTag) < prototype(Neos.Fusion:Tag) {
   async = false
   quality = NULL
   preset = NULL
-  @context.thumbnail = ${Neos.Media.Image.createThumbnail(
+  @context.thumbnail = ${this.asset ? Neos.Media.Image.createThumbnail(
     this.asset,
     this.preset,
     this.width,
@@ -22,7 +22,7 @@ prototype(Neos.Neos:ImageTag) < prototype(Neos.Fusion:Tag) {
     this.async,
     this.quality,
     this.format
-  )}
+  ) : null}
 
   tagName = 'img'
   attributes {