diff --git a/EventListener/ObjectUploadSubscriber.php b/EventListener/ObjectUploadSubscriber.php
index 40c55d9..5352608 100644
--- a/EventListener/ObjectUploadSubscriber.php
+++ b/EventListener/ObjectUploadSubscriber.php
@@ -167,8 +167,11 @@ private function storeFileUploads(UploadObjectInterface $object)
             $fileFieldProperty = lcfirst($camelizedFieldName);
             if (isset($fileUploads[$fileFieldProperty])) {
                 $getter = 'get'.$camelizedFieldName;
+                $setter = 'set'.$camelizedFieldName.'Upload';
 
                 $fileUploads[$fileFieldProperty]->move($this->getFilePath($objectName, $fileFieldConfiguration['name']), $object->$getter());
+
+                $object->$setter(null);
             }
         }
     }
diff --git a/Model/UploadTrait.php b/Model/UploadTrait.php
index 7b78c76..afd7422 100644
--- a/Model/UploadTrait.php
+++ b/Model/UploadTrait.php
@@ -53,7 +53,10 @@ public function setFileUpload(UploadedFile $file = null)
     {
         $propertyName = $this->getFileUploadPropertyName();
 
-        $this->fileUploads[$propertyName] = $file;
+        unset($this->fileUploads[$propertyName]);
+        if ($file instanceof UploadedFile) {
+            $this->fileUploads[$propertyName] = $file;
+        }
     }
 
     /**