diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java
index ce19098caa15..c93a98dfa242 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java
@@ -104,6 +104,11 @@ public class MasterPasswordDialog extends DialogWrapper {
    * @throws PasswordSafeException if the master password is not provided.
    */
   public static void askPassword(Project project, MasterKeyPasswordSafe safe) throws PasswordSafeException {
+    // trying empty password: people who have set up empty password, don't want to get disturbed by the prompt.
+    if (safe.setMasterPassword("")) {
+      return;
+    }
+
     String error = null;
     retries:
     for (int count = 0; count < NUMBER_OF_RETRIES; count++) {