diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index c2c754c715..68a2210814 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -24,7 +24,6 @@ import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
 import SettingsStore from '../../../settings/SettingsStore';
 import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
-import {renderSasWaitAccept} from '../../../sas_ui';
 
 const MODE_LEGACY = 'legacy';
 const MODE_SAS = 'sas';
@@ -128,7 +127,7 @@ export default class DeviceVerifyDialog extends React.Component {
                 body = this._renderSasVerificationPhaseStart();
                 break;
             case PHASE_WAIT_FOR_PARTNER_TO_ACCEPT:
-                body = renderSasWaitAccept(this.props.userId);
+                body = this._renderSasVerificationPhaseWaitAccept();
                 break;
             case PHASE_SHOW_SAS:
                 body = this._renderSasVerificationPhaseShowSas();
@@ -184,6 +183,17 @@ export default class DeviceVerifyDialog extends React.Component {
         );
     }
 
+    _renderSasVerificationPhaseWaitAccept() {
+        const Spinner = sdk.getComponent("views.elements.Spinner");
+
+        return (
+            <div>
+                <Spinner />
+                <p>{_t("Waiting for partner to accept...")}</p>
+            </div>
+        );
+    }
+
     _renderSasVerificationPhaseShowSas() {
         const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
         return <VerificationShowSas