diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index b068e6285..721d40b8f 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -270,29 +270,22 @@ const CGFloat kTypingCellHeight = 24;
     }
     else if (RiotSettings.shared.enableThreads)
     {
-        if (RiotSettings.shared.enableThreads)
+        //  if not in a thread, ignore all threaded events
+        if (event.isInThread)
         {
-            //  if not in a thread, ignore all threaded events
-            if (event.isInThread)
+            //  ignore the event
+            return NO;
+        }
+        //  also ignore events related to threaded events
+        if (event.relatesTo.eventId)
+        {
+            MXEvent *relatedEvent = [self.mxSession.store eventWithEventId:event.relatesTo.eventId
+                                                                    inRoom:event.roomId];
+            if (relatedEvent.isInThread)
             {
                 //  ignore the event
                 return NO;
             }
-            //  also ignore events related to threaded events
-            if (event.relatesTo.eventId)
-            {
-                MXEvent *relatedEvent = [self.mxSession.store eventWithEventId:event.relatesTo.eventId
-                                                                        inRoom:event.roomId];
-                if (relatedEvent.isInThread)
-                {
-                    //  ignore the event
-                    return NO;
-                }
-            }
-        }
-        else
-        {
-            return YES;
         }
     }