diff --git a/app/src/main/java/me/impy/aegis/IntroActivity.java b/app/src/main/java/me/impy/aegis/IntroActivity.java
index 4c37b87d..4aeec19b 100644
--- a/app/src/main/java/me/impy/aegis/IntroActivity.java
+++ b/app/src/main/java/me/impy/aegis/IntroActivity.java
@@ -109,13 +109,14 @@ public class IntroActivity extends AppIntro implements DerivationTask.Callback {
     @Override
     public void onDonePressed(Fragment currentFragment) {
         super.onDonePressed(currentFragment);
+
+        int cryptType = _authenticatedSlide.getCryptType();
         // wait for the key derivation background task
-        if (_passwordSlot == null || _passwordCipher == null) {
+        if (cryptType == CustomAuthenticationSlide.CRYPT_TYPE_NONE ||
+                _passwordSlot == null || _passwordCipher == null) {
             return;
         }
 
-        int cryptType = _authenticatedSlide.getCryptType();
-
         // generate the master key
         MasterKey masterKey = null;
         if (cryptType != CustomAuthenticationSlide.CRYPT_TYPE_NONE) {