diff --git a/app/views/RoomView/List.js b/app/views/RoomView/List.js
index 5ca13644..8860b8de 100644
--- a/app/views/RoomView/List.js
+++ b/app/views/RoomView/List.js
@@ -96,7 +96,7 @@ class List extends React.Component {
 			this.messagesSubscription = this.messagesObservable
 				.subscribe((data) => {
 					this.interaction = InteractionManager.runAfterInteractions(() => {
-						if (tmid) {
+						if (tmid && this.thread) {
 							data = [this.thread, ...data];
 						}
 						const messages = orderBy(data, ['ts'], ['desc']);