diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 62fbe5f929..0a61dc6105 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -356,7 +356,7 @@ export function stopMatrixClient() {
     Notifier.stop();
     UserActivity.stop();
     Presence.stop();
-    DMRoomMap.shared().stop();
+    if (DMRoomMap.shared()) DMRoomMap.shared().stop();
     var cli = MatrixClientPeg.get();
     if (cli) {
         cli.stopClient();