diff --git a/Riot/Modules/Contacts/ContactsTableViewController.h b/Riot/Modules/Contacts/ContactsTableViewController.h
index 8b535495b..f1b3effaf 100644
--- a/Riot/Modules/Contacts/ContactsTableViewController.h
+++ b/Riot/Modules/Contacts/ContactsTableViewController.h
@@ -122,7 +122,7 @@
 /**
  The delegate for the view controller.
  */
-@property (nonatomic) id<ContactsTableViewControllerDelegate> contactsTableViewControllerDelegate;
+@property (nonatomic, weak) id<ContactsTableViewControllerDelegate> contactsTableViewControllerDelegate;
 
 @end
 
diff --git a/Riot/Modules/Contacts/ContactsTableViewController.m b/Riot/Modules/Contacts/ContactsTableViewController.m
index adbc1f9e9..f208f6f67 100644
--- a/Riot/Modules/Contacts/ContactsTableViewController.m
+++ b/Riot/Modules/Contacts/ContactsTableViewController.m
@@ -33,12 +33,12 @@
     /**
      Observe kAppDelegateDidTapStatusBarNotification to handle tap on clock status bar.
      */
-    id kAppDelegateDidTapStatusBarNotificationObserver;
+    __weak id kAppDelegateDidTapStatusBarNotificationObserver;
     
     /**
      Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
      */
-    id kThemeServiceDidChangeThemeNotificationObserver;
+    __weak id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
 @property (nonatomic, strong) FindYourContactsFooterView *findYourContactsFooterView;
@@ -102,9 +102,13 @@
     self.contactsTableView.tableFooterView = [[UIView alloc] init];
     self.contactsAreFilteredWithSearch = NO;
     
+    MXWeakify(self);
+    
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
         
+        MXStrongifyAndReturnIfNil(self);
+        
         [self userInterfaceThemeDidChange];
         
     }];
@@ -158,10 +162,14 @@
 
     // Screen tracking
     [[Analytics sharedInstance] trackScreen:_screenName];
+    
+    MXWeakify(self);
 
     // Observe kAppDelegateDidTapStatusBarNotification.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
         
+        MXStrongifyAndReturnIfNil(self);
+        
         [self.contactsTableView setContentOffset:CGPointMake(-self.contactsTableView.adjustedContentInset.left, -self.contactsTableView.adjustedContentInset.top) animated:YES];
         
     }];