diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index 1025533c4..8641680c2 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -1280,7 +1280,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     }
     
     NSString *roomIdOrAlias;
-    NSString *threadId;
+    ThreadParameters *threadParameters;
     NSString *eventId;
     NSString *userId;
     NSString *groupId;
@@ -1365,12 +1365,16 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                     if (eventId)
                     {
                         MXEvent *event = [account.mxSession.store eventWithEventId:eventId inRoom:roomId];
-                        threadId = event.threadId;
+                        if (event.threadId)
+                        {
+                            threadParameters = [[ThreadParameters alloc] initWithThreadId:event.threadId
+                                                                          stackRoomScreen:YES];
+                        }
                     }
                     RoomNavigationParameters *roomNavigationParameters = [[RoomNavigationParameters alloc] initWithRoomId:roomId
-                                                                                                                 threadId:threadId
                                                                                                                   eventId:eventId
                                                                                                                 mxSession:account.mxSession
+                                                                                               threadParameters:threadParameters
                                                                                                    presentationParameters:screenPresentationParameters];
                     
                     [self showRoomWithParameters:roomNavigationParameters];
@@ -2893,9 +2897,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     ScreenPresentationParameters *presentationParameters = [[ScreenPresentationParameters alloc] initWithRestoreInitialDisplay:YES];
     
     RoomNavigationParameters *parameters = [[RoomNavigationParameters alloc] initWithRoomId:roomId
-                                                                                   threadId:nil
                                                                                     eventId:eventId
                                                                                   mxSession:mxSession
+                                                                 threadParameters:nil
                                                                      presentationParameters:presentationParameters];
     
     [self showRoomWithParameters:parameters];