diff --git a/src/Draupnir.ts b/src/Draupnir.ts
index 5682e418..d78fb30e 100644
--- a/src/Draupnir.ts
+++ b/src/Draupnir.ts
@@ -367,6 +367,7 @@ export class Draupnir implements Client, MatrixAdaptorContext {
   public stop(): void {
     this.clientRooms.off("timeline", this.timelineEventListener);
     this.reportPoller?.stop();
+    this.protectedRoomsSet.unregisterListeners();
   }
 
   public createRoomReference(roomID: StringRoomID): MatrixRoomID {