diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
index 04297d759..151f9733d 100644
--- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
@@ -150,11 +150,6 @@
             threadParameters = [[ThreadParameters alloc] initWithThreadId:event.threadId
                                                           stackRoomScreen:NO];
         }
-        else if (event.unsignedData.relations.thread || [self.mainSession.threadingService isEventThreadRoot:event])
-        {
-            threadParameters = [[ThreadParameters alloc] initWithThreadId:event.eventId
-                                                          stackRoomScreen:NO];
-        }
     }
 
     ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
index ea0c6a2f3..6be8de0e8 100644
--- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
@@ -157,11 +157,6 @@
             threadParameters = [[ThreadParameters alloc] initWithThreadId:event.threadId
                                                           stackRoomScreen:NO];
         }
-        else if (event.unsignedData.relations.thread || [self.mainSession.threadingService isEventThreadRoot:event])
-        {
-            threadParameters = [[ThreadParameters alloc] initWithThreadId:event.eventId
-                                                          stackRoomScreen:NO];
-        }
     }
 
     ScreenPresentationParameters *screenParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO stackAboveVisibleViews:NO];
diff --git a/Riot/Modules/Room/Search/RoomSearchViewController.m b/Riot/Modules/Room/Search/RoomSearchViewController.m
index 235d89798..2a8b3f5e2 100644
--- a/Riot/Modules/Room/Search/RoomSearchViewController.m
+++ b/Riot/Modules/Room/Search/RoomSearchViewController.m
@@ -149,11 +149,6 @@
             threadParameters = [[ThreadParameters alloc] initWithThreadId:event.threadId
                                                           stackRoomScreen:NO];
         }
-        else if (event.unsignedData.relations.thread || [self.mainSession.threadingService isEventThreadRoot:event])
-        {
-            threadParameters = [[ThreadParameters alloc] initWithThreadId:event.eventId
-                                                          stackRoomScreen:NO];
-        }
     }
     
     ScreenPresentationParameters *screenParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:NO