diff --git a/src/models/event.ts b/src/models/event.ts
index dcd11b53e1c..0b8adbca81c 100644
--- a/src/models/event.ts
+++ b/src/models/event.ts
@@ -45,6 +45,8 @@ import { DecryptionError } from "../crypto/algorithms";
 import { CryptoBackend } from "../common-crypto/CryptoBackend";
 import { WITHHELD_MESSAGES } from "../crypto/OlmDevice";
 import { IAnnotatedPushRule } from "../@types/PushRules";
+import { Room } from "./room";
+import { EventTimeline } from "./event-timeline";
 
 export { EventStatus } from "./event-status";
 
@@ -1137,8 +1139,9 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
      * if it were redacted before it was sent to us
      *
      * @param redactionEvent - event causing the redaction
+     * @param room - the room in which the event exists
      */
-    public makeRedacted(redactionEvent: MatrixEvent): void {
+    public makeRedacted(redactionEvent: MatrixEvent, room: Room): void {
         // quick sanity-check
         if (!redactionEvent.event) {
             throw new Error("invalid redactionEvent in makeRedacted");
@@ -1182,6 +1185,21 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
             }
         }
 
+        // If the redacted event was in a thread
+        if (this.threadRootId && this.threadRootId !== this.getId()) {
+            // Remove it from its thread
+            this.thread?.timelineSet.removeEvent(this.getId()!);
+            this.setThread(undefined);
+
+            // And insert it into the main timeline
+            const timeline = room.getLiveTimeline();
+            // We use insertEventIntoTimeline to insert it in timestamp order,
+            // because we don't know where it should go (until we have MSC4033).
+            timeline
+                .getTimelineSet()
+                .insertEventIntoTimeline(this, timeline, timeline.getState(EventTimeline.FORWARDS)!);
+        }
+
         this.invalidateExtensibleEvent();
     }
 
diff --git a/src/models/room.ts b/src/models/room.ts
index 804fa10c564..174bbf5d7d3 100644
--- a/src/models/room.ts
+++ b/src/models/room.ts
@@ -2329,7 +2329,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
             // if we know about this event, redact its contents now.
             const redactedEvent = redactId ? this.findEventById(redactId) : undefined;
             if (redactedEvent) {
-                redactedEvent.makeRedacted(event);
+                redactedEvent.makeRedacted(event, this);
 
                 // If this is in the current state, replace it with the redacted version
                 if (redactedEvent.isState()) {