diff --git a/ts/services/tapToViewMessagesDeletionService.ts b/ts/services/tapToViewMessagesDeletionService.ts
index 421b808e4..bbec211cf 100644
--- a/ts/services/tapToViewMessagesDeletionService.ts
+++ b/ts/services/tapToViewMessagesDeletionService.ts
@@ -89,6 +89,11 @@ class TapToViewMessagesDeletionService {
   }
 
   async #checkTapToViewMessages() {
+    if (!this.#shouldRun()) {
+      window.SignalContext.log.info('checkTapToViewMessages: not running');
+      return;
+    }
+
     const receivedAtMsForOldestTapToViewMessage =
       await DataReader.getNextTapToViewMessageTimestampToAgeOut();
     if (!receivedAtMsForOldestTapToViewMessage) {
@@ -116,12 +121,19 @@ class TapToViewMessagesDeletionService {
 
     clearTimeoutIfNecessary(this.#timeout);
     this.#timeout = setTimeout(async () => {
-      if (!this.#isPaused && !window.SignalContext.isTestOrMockEnvironment()) {
-        await eraseTapToViewMessages();
+      if (!this.#shouldRun()) {
+        window.SignalContext.log.info('checkTapToViewMessages: not running');
+        return;
       }
+
+      await eraseTapToViewMessages();
       this.update();
     }, wait);
   }
+
+  #shouldRun(): boolean {
+    return !this.#isPaused && !window.SignalContext.isTestOrMockEnvironment();
+  }
 }
 
 export const tapToViewMessagesDeletionService =