diff --git a/iphone/Maps/Classes/MWMTextView.m b/iphone/Maps/Classes/MWMTextView.m
index b3c4426f39..7c95bcbd6b 100644
--- a/iphone/Maps/Classes/MWMTextView.m
+++ b/iphone/Maps/Classes/MWMTextView.m
@@ -21,7 +21,7 @@
 }
 
 - (void)dealloc {
-  [NSNotificationCenter.defaultCenter removeObserver:self name:UITextViewTextDidChangeNotification object:nil];
+  [NSNotificationCenter.defaultCenter removeObserver:self];
 }
 
 - (UILabel *)placeholderView {
diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm
index 47a2130b24..9a3eca9a37 100644
--- a/iphone/Maps/Core/Location/MWMLocationManager.mm
+++ b/iphone/Maps/Core/Location/MWMLocationManager.mm
@@ -465,12 +465,7 @@ void setShowLocationAlert(BOOL needShow) {
   } else {
     _started = NO;
     [self stop];
-    [notificationCenter removeObserver:self
-                                  name:UIDeviceOrientationDidChangeNotification
-                                object:nil];
-    [notificationCenter removeObserver:self
-                                  name:UIDeviceBatteryStateDidChangeNotification
-                                object:nil];
+    [notificationCenter removeObserver:self];
   }
 }
 
diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Layout.h b/iphone/Maps/UI/Search/MWMSearchManager+Layout.h
index f5c19347f4..c39e4c5980 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager+Layout.h
+++ b/iphone/Maps/UI/Search/MWMSearchManager+Layout.h
@@ -3,5 +3,6 @@
 @interface MWMSearchManager (Layout)
 
 - (void)layoutTopViews;
+- (void)removeKeyboardObservers;
 
 @end
diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Layout.m b/iphone/Maps/UI/Search/MWMSearchManager+Layout.m
index f397ff84c9..f5ed87b18f 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager+Layout.m
+++ b/iphone/Maps/UI/Search/MWMSearchManager+Layout.m
@@ -85,6 +85,10 @@ static CGFloat const changeModeViewOffsetKeyboard = -12;
                                              object:nil];
 }
 
+- (void)removeKeyboardObservers {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 #pragma mark - keyboard movements
 - (void)keyboardWillShow:(NSNotification *)notification {
   CGSize keyboardSize = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue].size;
diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm
index d78d39a872..afabe94d26 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager.mm
@@ -485,6 +485,7 @@ using Observers = NSHashTable<Observer>;
       [contentView removeFromSuperview];
       [actionBarView removeFromSuperview];
       [searchBarView removeFromSuperview];
+      [self removeKeyboardObservers];
     }];
 }