diff --git a/repertory/librepertory/src/file_manager/file_manager.cpp b/repertory/librepertory/src/file_manager/file_manager.cpp
index 85e40c7e..c4b09a6c 100644
--- a/repertory/librepertory/src/file_manager/file_manager.cpp
+++ b/repertory/librepertory/src/file_manager/file_manager.cpp
@@ -419,15 +419,13 @@ auto file_manager::handle_file_rename(const std::string &from_api_path,
 
   swap_renamed_items(from_api_path, to_api_path);
 
-  ret = source_path.empty()
-            ? api_error::success
-            : provider_.set_item_meta(to_api_path, META_SOURCE, source_path);
-
   if (should_upload) {
     queue_upload(to_api_path, source_path, false);
   }
 
-  return ret;
+  return source_path.empty()
+             ? api_error::success
+             : provider_.set_item_meta(to_api_path, META_SOURCE, source_path);
 }
 
 auto file_manager::has_no_open_file_handles() const -> bool {