diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 01ee140eb3..9457e6ccfb 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -311,13 +311,13 @@ function waitForUserWidget(widgetId, add) {
             }
         }
 
-        if (satisfiesCondition(currentAccountDataEvent)) {
+        if (eventInIntendedState(currentAccountDataEvent)) {
             resolve();
             return;
         }
 
         function onAccountData(ev) {
-            if (satisfiesCondition(currentAccountDataEvent)) {
+            if (eventInIntendedState(currentAccountDataEvent)) {
                 MatrixClientPeg.get().removeListener('accountData', onAccountData);
                 clearTimeout(timerId);
                 resolve();