diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 444838908f..7699a78996 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -888,7 +888,7 @@ std::vector<BookmarkManager::SortingType> BookmarkManager::GetAvailableSortingTy
       {
         byTypeChecked = true;
       }
-      else
+      else if (type != BookmarkBaseType::None)
       {
         auto const count = ++typesCount[type];
         byTypeChecked = (count == kMinCommonTypesCount);
@@ -917,7 +917,7 @@ std::vector<BookmarkManager::SortingType> BookmarkManager::GetAvailableSortingTy
   std::vector<SortingType> sortingTypes;
   if (byTypeChecked)
     sortingTypes.push_back(SortingType::ByType);
-  if (hasMyPosition)
+  if (hasMyPosition && !group->GetUserMarks().empty())
     sortingTypes.push_back(SortingType::ByDistance);
   if (byTimeChecked)
     sortingTypes.push_back(SortingType::ByTime);