diff --git a/src/components/views/settings/account/PhoneNumbers.tsx b/src/components/views/settings/account/PhoneNumbers.tsx
index e5cca72867..9105dfc312 100644
--- a/src/components/views/settings/account/PhoneNumbers.tsx
+++ b/src/components/views/settings/account/PhoneNumbers.tsx
@@ -268,7 +268,7 @@ export default class PhoneNumbers extends React.Component<IProps, IState> {
                         <AccessibleButton
                             onClick={this.onContinueClick}
                             kind="primary"
-                            disabled={this.state.continueDisabled}
+                            disabled={this.state.continueDisabled || this.state.newPhoneNumberCode.length === 0}
                         >
                             { _t("Continue") }
                         </AccessibleButton>