diff --git a/lib/filesystem/FileManager.php b/lib/filesystem/FileManager.php
index bfa40424e3275ea041bf67cc046c5a51bb20fe11..21eb27aec20742ed75a6f874f9bf3343e10ffab7 100644
--- a/lib/filesystem/FileManager.php
+++ b/lib/filesystem/FileManager.php
@@ -1100,15 +1100,13 @@ class FileManager
             }
 
             //now go through all files and move them, too:
-            foreach ($source_folder->getFiles() as $file_ref) {
-                if (!($file_ref instanceof FileRef)) {
-                    $file_ref = FileRef::build((array) $file_ref, false);
-                    $file_ref->setFolderType('foldertype', $source_folder);
-                }
-                $result = self::moveFile($file_ref->getFileType(), $new_folder, $user);
-                if (!$result instanceof FileRef) {
-                    //error
-                    return $result;
+            foreach ($source_folder->getFiles() as $file) {
+                if ($file instanceof FileType) {
+                    $result = self::moveFile($file, $new_folder, $user);
+                    if (!$result instanceof FileType) {
+                        //error
+                        return $result;
+                    }
                 }
             }