diff --git a/repertory/librepertory/src/file_manager/file_manager.cpp b/repertory/librepertory/src/file_manager/file_manager.cpp
index c4b09a6c..84089223 100644
--- a/repertory/librepertory/src/file_manager/file_manager.cpp
+++ b/repertory/librepertory/src/file_manager/file_manager.cpp
@@ -384,6 +384,7 @@ auto file_manager::handle_file_rename(const std::string &from_api_path,
   std::string source_path{};
   auto file_iter = open_file_lookup_.find(from_api_path);
   if (file_iter != open_file_lookup_.end()) {
+    should_upload = file_iter->second->is_modified();
     source_path = file_iter->second->get_source_path();
   }
 
@@ -407,9 +408,7 @@ auto file_manager::handle_file_rename(const std::string &from_api_path,
     }
   }
 
-  if (should_upload) {
-    remove_upload(from_api_path);
-  }
+  remove_upload(from_api_path);
 
   auto ret = provider_.rename_file(from_api_path, to_api_path);
   if (ret != api_error::success) {