diff --git a/engine/filesystem_copy.go b/engine/filesystem_copy.go
index 97ff6a8..79a6e5c 100644
--- a/engine/filesystem_copy.go
+++ b/engine/filesystem_copy.go
@@ -79,6 +79,10 @@ func (f *FileSystemManager) copyFolderSubEntries(ctx context.Context, oldPath ut
 			return err
 		}
 
+		if len(entries) == 0 {
+			break
+		}
+
 		for _, item := range entries {
 			itemOldPath := oldPath.Child(item.FullPath.Name())
 			itemNewPath := newPath.Child(item.FullPath.Name())
@@ -88,7 +92,7 @@ func (f *FileSystemManager) copyFolderSubEntries(ctx context.Context, oldPath ut
 			}
 		}
 
-		if lastFileName == "" {
+		if lastFileName == "" || len(entries) < 1000 {
 			break
 		}
 	}
diff --git a/engine/filesystem_reanme.go b/engine/filesystem_rename.go
similarity index 97%
rename from engine/filesystem_reanme.go
rename to engine/filesystem_rename.go
index 7b7f43d..996a0b1 100644
--- a/engine/filesystem_reanme.go
+++ b/engine/filesystem_rename.go
@@ -77,6 +77,10 @@ func (f *FileSystemManager) moveFolderSubEntries(ctx context.Context, oldPath ut
 			return err
 		}
 
+		if len(entries) == 0 {
+			break
+		}
+
 		for _, item := range entries {
 			itemOldPath := oldPath.Child(item.FullPath.Name())
 			itemNewPath := newPath.Child(item.FullPath.Name())
@@ -86,7 +90,7 @@ func (f *FileSystemManager) moveFolderSubEntries(ctx context.Context, oldPath ut
 			}
 		}
 
-		if lastFileName == "" {
+		if lastFileName == "" || len(entries) < 1000 {
 			break
 		}
 	}