diff --git a/kded/secretagent.cpp b/kded/secretagent.cpp
--- a/kded/secretagent.cpp
+++ b/kded/secretagent.cpp
@@ -397,10 +397,15 @@
     if (!secretsMap.isEmpty()) {
         setting->secretsFromStringMap(secretsMap);
         if (!isVpn && setting->needSecrets(requestNew).isEmpty()) {
-            // Enough secrets were retrieved from storage
             request.connection[request.setting_name] = setting->secretsToMap();
-            sendSecrets(request.connection, request.message);
-            return true;
+            // WPA-PSK password should not be less than 8 characters long
+            if (request.connection[request.setting_name].value("psk").toString().length() >= 8) {
+                // Enough secrets were retrieved from storage
+                sendSecrets(request.connection, request.message);
+                return true;
+            } else {
+                request.flags |= SecretAgent::RequestNew;
+            }
         }
     }