diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm
index c1d995ddf5..1c55e5a89d 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager.mm
@@ -324,8 +324,15 @@ using Observers = NSHashTable<Observer>;
 
 - (void)onSearchCompleted
 {
-  if (self.state == MWMSearchManagerStateTableSearch)
-    [self updateTableSearchActionBar];
+  if (self.state != MWMSearchManagerStateTableSearch)
+     return;
+  [self.tableViewController onSearchCompleted];
+  [self updateTableSearchActionBar];
+}
+
+- (void)onSearchResultsUpdated
+{
+  [self.tableViewController reloadData];
 }
 
 - (void)updateTableSearchActionBar
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
index 52fae79df5..513922453c 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
@@ -19,18 +19,10 @@
 {
   self = [super init];
   if (self)
-  {
     _delegate = delegate;
-    [MWMSearch addObserver:self];
-  }
   return self;
 }
 
-- (void)dealloc
-{
-  [MWMSearch removeObserver:self];
-}
-
 - (void)viewDidLoad
 {
   [super viewDidLoad];
@@ -64,7 +56,7 @@
 {
   [coordinator
       animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> context) {
-        [self onSearchResultsUpdated];
+        [self reloadData];
       }
                       completion:nil];
 }
@@ -168,16 +160,10 @@
 
 - (void)onSearchCompleted
 {
-  [self onSearchResultsUpdated];
+  [self reloadData];
   BOOL const noResults = [MWMSearch resultsCount] == 0;
   self.tableView.hidden = noResults;
   [(MWMSearchTableView *)self.view hideNoResultsView:!noResults];
-  [self reloadData];
-}
-
-- (void)onSearchResultsUpdated
-{
-  [self reloadData];
 }
 
 @end