diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index b294c2b975..dbbbe0ab6f 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -676,6 +676,9 @@ void Editor::UploadChanges(string const & key, string const & secret, TChangeset
   if (m_notes->NotUploadedNotesCount())
     UploadNotes(key, secret);
 
+  // We need to be sure edits will be applied for correct features (all features are migrated).
+  LoadMapEdits();
+
   if (!HaveMapEditsToUpload())
   {
     LOG(LDEBUG, ("There are no local edits to upload."));