diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index acb6f05854..629c4d0376 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -437,15 +437,6 @@ void Geocoder::SetParamsForCategorialSearch(Params const & params)
 
 size_t Geocoder::OrderCountries(bool inViewport, vector<shared_ptr<MwmInfo>> & infos)
 {
-  // TODO (@y): remove this if crashes in this function
-  // disappear. Otherwise, remove null infos and re-check MwmSet
-  // again.
-  for (auto const & info : infos)
-  {
-    CHECK(info.get(),
-          ("MwmSet invariant violated. Please, contact @y if you know how to reproduce this."));
-  }
-
   vector<KeyedMwmInfo> keyedInfos;
   keyedInfos.reserve(infos.size());
   for (auto const & info : infos)