diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 9c7f04555a..de4d7bccbf 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -56,7 +56,10 @@ export default class CrossSigningPanel extends React.PureComponent {
                             makeRequest,
                         },
                     );
-                    await finished;
+                    const [confirmed] = await finished;
+                    if (!confirmed) {
+                        throw new Error("Cross-signing key upload auth canceled");
+                    }
                 },
             });
             this.setState(this._getUpdatedStatus());