diff --git a/components/password-prompt.js b/components/password-prompt.js
index 8e4a7194d3b7c0b7b12acb88a3e8d17c58d57524..ce9122122043f3f17c34dc7367ca8a316224c91e 100644
--- a/components/password-prompt.js
+++ b/components/password-prompt.js
@@ -26,13 +26,14 @@ export default class PasswordPrompt extends Component {
   async tryToOpenDb() {
     try {
       await openDb({ persistConnection: true })
-      await saveEncryptionFlag(false)
-      this.props.showApp()
     } catch (err) {
       this.setState({ showPasswordPrompt: true })
       await saveEncryptionFlag(true)
       return
     }
+
+    await saveEncryptionFlag(false)
+    this.props.showApp()
   }
 
   passHashToDb = async hash => {