diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index bcb062d63e..a3b6abb8f3 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -538,6 +538,9 @@ bool Editor::HaveSomethingToUpload(MwmSet::MwmId const & mwmId) const
 void Editor::UploadChanges(string const & key, string const & secret, TChangesetTags tags,
                            TFinishUploadCallback callBack)
 {
+  if (m_notes->UnuploadedNotesCount())
+    UploadNotes(key, secret);
+
   if (!HaveSomethingToUpload())
   {
     LOG(LDEBUG, ("There are no local edits to upload."));