diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 2b4569fba..5e91b0d51 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -968,11 +968,6 @@ const CGFloat kTypingCellHeight = 24;
 
 - (void)threadingService:(MXThreadingService *)service didCreateNewThread:(MXThread *)thread direction:(MXTimelineDirection)direction
 {
-    if (self.threadId)
-    {
-        //  no need to reload the thread screen
-        return;
-    }
     if (direction == MXTimelineDirectionBackwards)
     {
         //  no need to reload when paginating back
diff --git a/Riot/Modules/Threads/ThreadsCoordinator.swift b/Riot/Modules/Threads/ThreadsCoordinator.swift
index 2f49786c5..e28d815fd 100644
--- a/Riot/Modules/Threads/ThreadsCoordinator.swift
+++ b/Riot/Modules/Threads/ThreadsCoordinator.swift
@@ -68,6 +68,10 @@ final class ThreadsCoordinator: NSObject, ThreadsCoordinatorProtocol {
         // Detect when view controller has been dismissed by gesture when presented modally (not in full screen).
         self.navigationRouter.toPresentable().presentationController?.delegate = self
         
+        guard parameters.threadId == nil else {
+            return
+        }
+        
         if self.navigationRouter.modules.isEmpty == false {
             self.navigationRouter.push(rootCoordinator, animated: true, popCompletion: { [weak self] in
                 self?.remove(childCoordinator: rootCoordinator)
diff --git a/changelog.d/5441.change b/changelog.d/5441.change
new file mode 100644
index 000000000..ba20e8807
--- /dev/null
+++ b/changelog.d/5441.change
@@ -0,0 +1 @@
+RoomDataSource: Reload thread screen for the first message.