diff --git a/Neos.ContentRepository/Classes/Domain/Model/Node.php b/Neos.ContentRepository/Classes/Domain/Model/Node.php
index <HASH>..<HASH> 100644
--- a/Neos.ContentRepository/Classes/Domain/Model/Node.php
+++ b/Neos.ContentRepository/Classes/Domain/Model/Node.php
@@ -877,16 +877,21 @@ class Node implements NodeInterface, CacheAwareInterface
     public function getProperty($propertyName, $returnNodesAsIdentifiers = false)
     {
         $value = $this->nodeData->getProperty($propertyName);
-        if (empty($value)) {
+        $nodeType = $this->getNodeType();
+        $expectedPropertyType = $nodeType->getPropertyType($propertyName);
+
+        if ($expectedPropertyType === 'Neos\Media\Domain\Model\ImageInterface' && empty($value)) {
             return null;
         }
 
-        $nodeType = $this->getNodeType();
+        if (empty($value)) {
+            return $value;
+        }
+
         if (!$nodeType->hasConfiguration('properties.' . $propertyName)) {
             return $value;
         }
 
-        $expectedPropertyType = $nodeType->getPropertyType($propertyName);
         if ($expectedPropertyType === 'references') {
             return ($returnNodesAsIdentifiers ? $value : $this->resolvePropertyReferences($value));
         }
BUGFIX: Return ``null`` if image property comes back empty