diff --git a/ts/test-mock/messaging/safety_number_test.ts b/ts/test-mock/messaging/safety_number_test.ts
index a726c2b03..01a2026c3 100644
--- a/ts/test-mock/messaging/safety_number_test.ts
+++ b/ts/test-mock/messaging/safety_number_test.ts
@@ -14,6 +14,7 @@ import {
   clickOnConversation,
   typeIntoInput,
   expectSystemMessages,
+  waitForEnabledComposer,
 } from '../helpers';
 
 export const debug = createDebug('mock:test:safetyNumber');
@@ -108,7 +109,7 @@ describe('safety number', function (this: Mocha.Suite) {
 
     await clickOnConversation(window, alice);
 
-    const input = await app.waitForEnabledComposer();
+    const input = await waitForEnabledComposer(window);
     await typeIntoInput(input, 'Hello Alice!');
 
     await changeIdentityKey();
diff --git a/ts/test-mock/rate-limit/viewed_test.ts b/ts/test-mock/rate-limit/viewed_test.ts
index 02895d048..6644f9198 100644
--- a/ts/test-mock/rate-limit/viewed_test.ts
+++ b/ts/test-mock/rate-limit/viewed_test.ts
@@ -291,7 +291,7 @@ describe('challenge/receipts', function (this: Mocha.Suite) {
 
     debug('Sending a message back to user - will trigger captcha!');
     {
-      const input = await app.waitForEnabledComposer();
+      const input = await waitForEnabledComposer(window);
       await typeIntoInput(input, 'Hi, good to hear from you!');
       await input.press('Enter');
     }
@@ -314,7 +314,7 @@ describe('challenge/receipts', function (this: Mocha.Suite) {
 
     debug('Sending another message - this time it should not trigger captcha!');
     {
-      const input = await app.waitForEnabledComposer();
+      const input = await waitForEnabledComposer(window);
       await typeIntoInput(input, 'How have you been lately?');
       await input.press('Enter');
     }
@@ -338,7 +338,7 @@ describe('challenge/receipts', function (this: Mocha.Suite) {
       'Sending to Contact B - we should not pop captcha because we are waiting!'
     );
     {
-      const input = await app.waitForEnabledComposer();
+      const input = await waitForEnabledComposer(window);
       await typeIntoInput(input, 'You the cow guy from craigslist?');
       await input.press('Enter');
     }