diff --git a/android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java b/android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java
index 2bd8e3de3f..1b03127ba3 100644
--- a/android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java
+++ b/android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java
@@ -18,7 +18,8 @@ public enum GuidesState
           Toast.makeText(context, R.string.no_routes_in_the_area_toast, Toast.LENGTH_SHORT).show();
         }
       },
-  NETWORK_ERROR;
+  NETWORK_ERROR,
+  FATAL_NETWORK_ERROR;
 
   public void activate(@NonNull Context context)
   {
diff --git a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm
index 9ecce9453b..fd1b04d738 100644
--- a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm
+++ b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm
@@ -122,6 +122,8 @@ static NSString *kGuidesWasShown = @"guidesWasShown";
       return MWMMapOverlayGuidesStateNoData;
     case GuidesManager::GuidesState::NetworkError:
       return MWMMapOverlayGuidesStateNetworkError;
+    case GuidesManager::GuidesState::FatalNetworkError:
+      return MWMMapOverlayGuidesStateNetworkError;
   }
 }
 
diff --git a/map/guides_manager.cpp b/map/guides_manager.cpp
index 63975a3841..7992253f2a 100644
--- a/map/guides_manager.cpp
+++ b/map/guides_manager.cpp
@@ -328,7 +328,8 @@ void GuidesManager::UpdateGuideSelection()
     if (mark->GetGuideId() == m_activeGuide)
     {
       es.CreateUserMark<GuideSelectionMark>(mark->GetPivot());
-      break;
+      return;
     }
   }
+  m_activeGuide.clear();
 }