diff --git a/app/controllers/materialien/files.php b/app/controllers/materialien/files.php
index 429a98c5d94b2f01227ad845a74af9725dc7346d..f5857b6c88c256a3cf57b266fc6b509c6e62de31 100644
--- a/app/controllers/materialien/files.php
+++ b/app/controllers/materialien/files.php
@@ -381,10 +381,18 @@ class Materialien_FilesController extends MVVController
         $top_folder = $this->getTopFolder($output['mvvfile_id']);
 
         if ($document_id) {
-            $file = File::find($document_id);
+            $ref = FileRef::find($document_id);
+            $ref->name = $_FILES['file']['name'];
+            $ref->store();
+
+            $file = $ref->file;
+            $file->name = $_FILES['file']['name'];
             $file->mime_type = $_FILES['file']['type'] ?? get_mime_type($_FILES['file']['name']);
             $file->size = $_FILES['file']['size'] ?? filesize($_FILES['file']['tmp_name']);
             $file->connectWithDataFile($_FILES['file']['tmp_name']);
+            $file->store();
+
+            $file = new StandardFile($ref);
         } else {
             $file = StandardFile::create($_FILES['file']);
         }