diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 56ab95084..6d989d669 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -2257,6 +2257,12 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
     }
     
     UIViewController *suggestionsViewController = self.userSuggestionCoordinator.toPresentable;
+    
+    if (!suggestionsViewController)
+    {
+        return;
+    }
+    
     [suggestionsViewController.view setTranslatesAutoresizingMaskIntoConstraints:NO];
     
     [self addChildViewController:suggestionsViewController];