diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 721d40b8f..da550e643 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -1000,6 +1000,11 @@ const CGFloat kTypingCellHeight = 24;
 
 - (void)newThreadCreated:(NSNotification *)notification
 {
+    if (self.threadId)
+    {
+        //  no need to reload the thread screen
+        return;
+    }
     NSUInteger count = 0;
     @synchronized (bubbles)
     {
diff --git a/changelog.d/5263.bugfix b/changelog.d/5263.bugfix
new file mode 100644
index 000000000..cc00e2a0c
--- /dev/null
+++ b/changelog.d/5263.bugfix
@@ -0,0 +1 @@
+RoomDataSource: Avoid reloading of data source on thread screen itself.