diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
index ca413abc26..9dc83ad223 100644
--- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
+++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
@@ -155,6 +155,10 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
   if ([MWMRouter isTaxi])
     return;
 
+  self.navigationInfo = info;
+  if (!info)
+    return;
+
   NSDictionary * routingNumberAttributes = @{
     NSForegroundColorAttributeName : [UIColor blackPrimaryText],
     NSFontAttributeName : [UIFont bold24]
@@ -165,7 +169,6 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
   };
 
   self.estimateLabel.attributedText = info.estimate;
-  self.navigationInfo = info;
   if (self.routingInfoPageControl.currentPage == 0)
   {
     self.timeLabel.text = [NSDateComponentsFormatter etaStringFrom:info.timeToTarget];
diff --git a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm
index a531920075..b295de0d9d 100644
--- a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm
+++ b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm
@@ -50,8 +50,7 @@
     tableView.dataSource = self;
     [tableView registerWithCellClass:[MWMSearchHistoryRequestCell class]];
     [tableView registerWithCellClass:[MWMSearchHistoryClearCell class]];
-    if (isRouteSearch)
-      [tableView registerWithCellClass:[MWMSearchHistoryMyPositionCell class]];
+    [tableView registerWithCellClass:[MWMSearchHistoryMyPositionCell class]];
     [tableView reloadData];
   }
 }