diff --git a/src/bundle/IO/Command/MigrateFilesCommand.php b/src/bundle/IO/Command/MigrateFilesCommand.php
index 213369d40f..d29b5c7c53 100644
--- a/src/bundle/IO/Command/MigrateFilesCommand.php
+++ b/src/bundle/IO/Command/MigrateFilesCommand.php
@@ -277,8 +277,10 @@ protected function migrateFiles(
 
         foreach ($this->fileListers as $fileLister) {
             $pass = 0;
+            $fileCount = $fileLister->countFiles();
             do {
-                $metadataList = $fileLister->loadMetadataList($bulkCount, $pass * $bulkCount);
+                $offset = $pass * $bulkCount;
+                $metadataList = $fileLister->loadMetadataList($bulkCount, $offset);
 
                 foreach ($metadataList as $metadata) {
                     if (!$dryRun) {
@@ -304,7 +306,7 @@ protected function migrateFiles(
                 }
 
                 ++$pass;
-            } while (count($metadataList) > 0);
+            } while ($offset + $bulkCount < $fileCount);
         }
 
         $progress->setMessage('');