diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 5633bd0bc7..0cb120019e 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -133,7 +133,6 @@ module.exports = React.createClass({
             threePids: [],
             phase: "UserSettings.LOADING", // LOADING, DISPLAY
             email_add_pending: false,
-            msisdn_add_pending: false,
             vectorVersion: null,
             rejectingInvites: false,
         };
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index bb5ecd2694..3a348393aa 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -35,6 +35,7 @@ export default WithMatrixClient(React.createClass({
             busy: false,
             phoneCountry: null,
             phoneNumber: "",
+            msisdn_add_pending: false,
         };
     },
 
@@ -137,7 +138,7 @@ export default WithMatrixClient(React.createClass({
         if (this.state.msisdn_add_pending) {
             return <Loader />;
         } else if (this.props.matrixClient.isGuest()) {
-            return null;
+            return <div />;
         }
 
         const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');