diff --git a/go_cloud/internal/http/routes.go b/go_cloud/internal/http/routes.go
index 440fba1..1fbc00e 100644
--- a/go_cloud/internal/http/routes.go
+++ b/go_cloud/internal/http/routes.go
@@ -4,6 +4,7 @@ import (
 	"archive/zip"
 	"bytes"
 	"context"
+	"database/sql"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -1664,23 +1665,14 @@ func moveUserFileHandler(w http.ResponseWriter, r *http.Request, db *database.DB
 	}
 
 	// Get source file details before moving
-	sourceFiles, err := db.GetUserFiles(r.Context(), userID, "/", "", 0, 1000)
+	sourceFile, err := db.GetUserFileByPath(r.Context(), userID, req.SourcePath)
 	if err != nil {
-		errors.LogError(r, err, "Failed to get user files")
-		errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
-		return
-	}
-
-	var sourceFile *database.File
-	for i := range sourceFiles {
-		if sourceFiles[i].Path == req.SourcePath {
-			sourceFile = &sourceFiles[i]
-			break
+		if err == sql.ErrNoRows {
+			errors.WriteError(w, errors.CodeInvalidArgument, "Source file not found", http.StatusNotFound)
+			return
 		}
-	}
-
-	if sourceFile == nil {
-		errors.WriteError(w, errors.CodeInvalidArgument, "Source file not found", http.StatusNotFound)
+		errors.LogError(r, err, "Failed to get source file")
+		errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
 		return
 	}
 
@@ -1700,13 +1692,13 @@ func moveUserFileHandler(w http.ResponseWriter, r *http.Request, db *database.DB
 
 	// Determine new file name - check if target is a folder
 	var newPath string
-	var targetFile *database.File
-	for i := range sourceFiles {
-		if sourceFiles[i].Path == req.TargetPath {
-			targetFile = &sourceFiles[i]
-			break
-		}
+	targetFile, err := db.GetUserFileByPath(r.Context(), userID, req.TargetPath)
+	if err != nil && err != sql.ErrNoRows {
+		errors.LogError(r, err, "Failed to get target file")
+		errors.WriteError(w, errors.CodeInternal, "Server error", http.StatusInternalServerError)
+		return
 	}
+	// If err == sql.ErrNoRows, targetFile is nil
 
 	if targetFile != nil && targetFile.Type == "folder" {
 		// Target is a folder, move file into it