diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
index bc13eaebe5..0f424a0d0e 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
@@ -36,7 +36,7 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState) {
 @property(nonatomic, readonly) MWMNavigationDashboardEntity * entity;
 @property(nonatomic, readonly) MWMRoutePreview * routePreview;
 @property(nonatomic) MWMNavigationDashboardState state;
-@property(nonatomic, readonly) MWMTaxiPreviewDataSource * taxiDataSource;
+@property(nonatomic) MWMTaxiPreviewDataSource * taxiDataSource;
 @property(weak, nonatomic, readonly) id<MWMNavigationDashboardManagerProtocol> delegate;
 @property(nonatomic) CGFloat topBound;
 @property(nonatomic) CGFloat leftBound;
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index 972cc4ed6c..b7a97ebada 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -42,8 +42,6 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
 
 @property(nonatomic) MWMNavigationDashboardEntity * entity;
 
-@property(nonatomic) MWMTaxiPreviewDataSource * taxiDataSource;
-
 @end
 
 @implementation MWMNavigationDashboardManager
@@ -110,7 +108,6 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
   if (IPAD && self.state != MWMNavigationDashboardStateNavigation)
     [self.delegate routePreviewDidChangeFrame:{}];
   [MWMRouter stopRouting];
-  self.taxiDataSource = nil;
 }
 
 #pragma mark - MWMTaxiDataSource
diff --git a/iphone/Maps/Classes/Routing/MWMRouter.mm b/iphone/Maps/Classes/Routing/MWMRouter.mm
index 674c894644..830d13cf07 100644
--- a/iphone/Maps/Classes/Routing/MWMRouter.mm
+++ b/iphone/Maps/Classes/Routing/MWMRouter.mm
@@ -86,7 +86,12 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
   [[UIApplication sharedApplication] openURL:taxiDataSource.taxiURL];
 }
 
-+ (void)stopRouting { [[MWMRouter router] stop]; }
++ (void)stopRouting
+{
+  [[MWMRouter router] stop];
+  [MWMNavigationDashboardManager manager].taxiDataSource = nil;
+}
+
 - (instancetype)initRouter
 {
   self = [super init];