diff --git a/components/settings/password/delete.js b/components/settings/password/delete.js
index 0673961d34e451c61c252d0a5928e5e01be68ae1..c4edf40280317884cfcd686c42d9b1ca0f793b3d 100644
--- a/components/settings/password/delete.js
+++ b/components/settings/password/delete.js
@@ -64,6 +64,10 @@ export default class DeletePassword extends Component {
               requestHash('pre-delete-pw-check', this.state.currentPassword)
             }
           }}
+          disabled={
+            this.state.enteringCurrentPassword &&
+            !this.state.currentPassword
+          }
           style={styles.settingsButton}
         >
           <AppText style={styles.settingsButtonText}>