diff --git a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
index 4a1c26dd4..ef46e0c9a 100644
--- a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
+++ b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
@@ -72,9 +72,11 @@ trait FlexMediaTrait
                     $media->add($filename, MediumFactory::fromUploadedFile($upload));
                 }
             }
+
+            $media->setTimestamps();
         }
 
-        return $this->media->setTimestamps();
+        return $this->media;
     }
 
     public function checkUploadedMediaFile(UploadedFileInterface $uploadedFile)
@@ -309,6 +311,17 @@ trait FlexMediaTrait
         return $file && file_exists($file) ? MediumFactory::fromFile($file) : null;
     }
 
+
+    protected function offsetLoad_media()
+    {
+        return $this->getMedia();
+    }
+
+    protected function offsetSerialize_media()
+    {
+        return null;
+    }
+
     abstract public function getFlexDirectory(): FlexDirectory;
 
     abstract public function getStorageKey();