diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index d0cdd19bf..afab1fb6b 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -1401,6 +1401,11 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
     LOG(ERROR) << "File remote location was changed from " << y_node->remote_.full.value() << " to "
                << x_node->remote_.full.value();
   }
+
+  bool drop_last_successful_force_reupload_time = x_node->last_successful_force_reupload_time_ <= 0 &&
+                                                  x_node->remote_.full &&
+                                                  x_node->remote_.full_source == FileLocationSource::FromServer;
+
   auto count_local = [](auto &node) {
     return std::accumulate(node->file_ids_.begin(), node->file_ids_.end(), 0,
                            [](const auto &x, const auto &y) { return x + (y.get_remote() != 0); });
@@ -1549,7 +1554,9 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
   node->need_load_from_pmc_ |= other_node->need_load_from_pmc_;
   node->can_search_locally_ &= other_node->can_search_locally_;
 
-  if (other_node->last_successful_force_reupload_time_ > node->last_successful_force_reupload_time_) {
+  if (drop_last_successful_force_reupload_time) {
+    node->last_successful_force_reupload_time_ = -1e10;
+  } else if (other_node->last_successful_force_reupload_time_ > node->last_successful_force_reupload_time_) {
     node->last_successful_force_reupload_time_ = other_node->last_successful_force_reupload_time_;
   }
 
diff --git a/td/telegram/files/FileManager.h b/td/telegram/files/FileManager.h
index 08f8a8a5d..d6da57540 100644
--- a/td/telegram/files/FileManager.h
+++ b/td/telegram/files/FileManager.h
@@ -57,7 +57,7 @@ struct NewRemoteFileLocation {
   unique_ptr<PartialRemoteFileLocation> partial;
 
   //TODO: use RemoteId
-  // hardest part is to determine wether we should flush this location to db.
+  // hardest part is to determine whether we should flush this location to db.
   // probably, will need some generation in RemoteInfo
   optional<FullRemoteFileLocation> full;
   bool is_full_alive{false};  // if false, then we may try to upload this file