diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 2ba9caa4e3..bea55ae8a8 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -214,6 +214,7 @@ module.exports = React.createClass({
             this._refreshFromServer();
             this.setState({email_add_pending: false});
         }, (err) => {
+            this.setState({email_add_pending: false});
             if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 var message = "Unable to verify email address. "