diff --git a/applications/services/storage/storage_external_api.c b/applications/services/storage/storage_external_api.c
index 549397c87de..5fcaa59216b 100644
--- a/applications/services/storage/storage_external_api.c
+++ b/applications/services/storage/storage_external_api.c
@@ -424,19 +424,25 @@ FS_Error storage_common_remove(Storage* storage, const char* path) {
 FS_Error storage_common_rename(Storage* storage, const char* old_path, const char* new_path) {
     FS_Error error;
 
-    if(storage_file_exists(storage, new_path)) {
-        error = storage_common_remove(storage, new_path);
+    do {
+        if(!storage_common_exists(storage, old_path)) {
+            error = FSE_INVALID_NAME;
+            break;
+        }
+
+        if(storage_file_exists(storage, new_path)) {
+            storage_common_remove(storage, new_path);
+        }
+
+        error = storage_common_copy(storage, old_path, new_path);
         if(error != FSE_OK) {
-            return error;
+            break;
         }
-    }
 
-    error = storage_common_copy(storage, old_path, new_path);
-    if(error == FSE_OK) {
         if(!storage_simply_remove_recursive(storage, old_path)) {
             error = FSE_INTERNAL;
         }
-    }
+    } while(false);
 
     return error;
 }