diff --git a/repertory/librepertory/src/file_manager/file_manager.cpp b/repertory/librepertory/src/file_manager/file_manager.cpp
index 6d0b1cb1..f4db0737 100644
--- a/repertory/librepertory/src/file_manager/file_manager.cpp
+++ b/repertory/librepertory/src/file_manager/file_manager.cpp
@@ -1019,8 +1019,6 @@ void file_manager::upload_completed(const file_upload_completed &evt) {
 
     auto err = api_error_from_string(evt.get_result().get<std::string>());
     if (err == api_error::success) {
-      upload_lookup_.erase(evt.get_api_path());
-
       auto result =
           utils::db::sqlite::db_delete{*db_.get(), upload_active_table}
               .where("api_path")
@@ -1032,6 +1030,8 @@ void file_manager::upload_completed(const file_upload_completed &evt) {
             evt.get_source().get<std::string>(),
             "failed to remove from upload_active table");
       }
+
+      upload_lookup_.erase(evt.get_api_path());
     } else {
       bool exists{};
       auto res = provider_.is_file(evt.get_api_path(), exists);