diff --git a/src/models/room.ts b/src/models/room.ts
index d6127e792..b655384b6 100644
--- a/src/models/room.ts
+++ b/src/models/room.ts
@@ -1748,7 +1748,7 @@ export class Room extends EventEmitter {
             // types X Y Z to the timeline".
             this.addLiveEvent(events[i], duplicateStrategy, fromCache);
             const thread = this.threads.get(events[i].getId());
-            if (thread && !thread.ready) {
+            if (thread) {
                 thread.addEvent(events[i], true);
             }
         }
diff --git a/src/models/thread.ts b/src/models/thread.ts
index a47b8fefe..112a99cca 100644
--- a/src/models/thread.ts
+++ b/src/models/thread.ts
@@ -107,9 +107,7 @@ export class Thread extends TypedEventEmitter<ThreadEvent> {
             this._currentUserParticipated = true;
         }
 
-        if (this.ready) {
-            this.client.decryptEventIfNeeded(event, {});
-        }
+        await this.client.decryptEventIfNeeded(event, {});
         this.emit(ThreadEvent.Update, this);
     }
 
@@ -129,13 +127,6 @@ export class Thread extends TypedEventEmitter<ThreadEvent> {
         return threadReplies[threadReplies.length - 1];
     }
 
-    /**
-     * Determines thread's ready status
-     */
-    public get ready(): boolean {
-        return this.rootEvent !== undefined;
-    }
-
     /**
      * The thread ID, which is the same as the root event ID
      */