diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 93aee0fa..58a150d8 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -415,7 +415,7 @@ public class PgpHandler extends Activity {
                 return;
             }
 
-            if (pass.isEmpty() || extra.isEmpty()) {
+            if (pass.isEmpty() && extra.isEmpty()) {
                 showToast("You cannot use an empty password or empty extra content");
                 return;
             }