diff --git a/ts/background.ts b/ts/background.ts
index 99c09dec4..85bcc1018 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -1840,8 +1840,10 @@ export async function startApp(): Promise<void> {
         await messageReceiver.stopProcessing();
 
         await window.waitForAllBatchers();
-        messageReceiver.unregisterBatchers();
+      }
 
+      if (messageReceiver) {
+        messageReceiver.unregisterBatchers();
         messageReceiver = null;
       }
 
@@ -3185,8 +3187,10 @@ export async function startApp(): Promise<void> {
       await messageReceiver.stopProcessing();
 
       await window.waitForAllBatchers();
-      messageReceiver.unregisterBatchers();
+    }
 
+    if (messageReceiver) {
+      messageReceiver.unregisterBatchers();
       messageReceiver = null;
     }