diff --git a/src/DraupnirBotMode.ts b/src/DraupnirBotMode.ts
index 08dd4a44..95da128b 100644
--- a/src/DraupnirBotMode.ts
+++ b/src/DraupnirBotMode.ts
@@ -96,5 +96,9 @@ export async function makeDraupnirBotModeFromConfig(
     if (isError(draupnir)) {
         throw draupnir.error;
     }
+    matrixEmitter.on('room.event', (roomID, event) => {
+        roomStateManagerFactory.handleTimelineEvent(roomID, event);
+        clientsInRoomMap.handleTimelineEvent(roomID, event);
+    })
     return draupnir.ok;
 }
diff --git a/src/index.ts b/src/index.ts
index 090c0c82..7e9411f4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -96,6 +96,7 @@ import { DefaultEventDecoder } from "matrix-protection-suite";
     }
     try {
         await bot.start();
+        await config.RUNTIME.client.start();
         healthz.isHealthy = true;
     } catch (err) {
         console.error(`Mjolnir failed to start: ${err}`);