diff --git a/indexer/index.cpp b/indexer/index.cpp
index 7d6e4f6d4a..3110b8a08a 100644
--- a/indexer/index.cpp
+++ b/indexer/index.cpp
@@ -123,15 +123,11 @@ void Index::FeaturesLoaderGuard::GetFeatureByIndex(uint32_t index, FeatureType &
   ASSERT_NOT_EQUAL(osm::Editor::FeatureStatus::Deleted, m_editor.GetFeatureStatus(id, index),
                    ("Deleted feature was cached. Please review your code."));
   if (!m_editor.Instance().GetEditedFeature(id, index, ft))
-  {
-    m_vector.GetByIndex(index, ft);
-    ft.SetID(FeatureID(id, index));
-  }
+    GetOriginalFeatureByIndex(index, ft);
 }
 
 void Index::FeaturesLoaderGuard::GetOriginalFeatureByIndex(uint32_t index, FeatureType & ft) const
 {
-  MwmId const & id = m_handle.GetId();
   m_vector.GetByIndex(index, ft);
-  ft.SetID(FeatureID(id, index));
+  ft.SetID(FeatureID(m_handle.GetId(), index));
 }