diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 44da65bad..5601a0824 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -687,7 +687,7 @@ static CGSize kThreadListBarButtonItemImageSize;
     
     self.showSettingsInitially = NO;
 
-    if (!RiotSettings.shared.threadsNoticeDisplayed && RiotSettings.shared.enableThreads)
+    if (!RiotSettings.shared.threadsNoticeDisplayed && RiotSettings.shared.enableThreads && BWIBuildSettings.shared.bwiShowThreads)
     {
         [self showThreadsNotice];
     }