diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
index 8480205af..56b3caf91 100644
--- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
+++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
@@ -50,7 +50,7 @@
     NSLayoutConstraint *leftMarkerViewConstraint;
     
     // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
-    id kThemeServiceDidChangeThemeNotificationObserver;
+    __weak id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
 @end
@@ -183,9 +183,13 @@
     
     [self createSegmentedViews];
     
+    MXWeakify(self);
+    
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
         
+        MXStrongifyAndReturnIfNil(self);
+        
         [self userInterfaceThemeDidChange];
         
     }];