diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/BootstrapAdminService.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/BootstrapAdminService.java
index 1cede5f9010..45d5eae07ad 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/BootstrapAdminService.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/BootstrapAdminService.java
@@ -78,6 +78,9 @@ public class BootstrapAdminService extends AbstractNonServerCommand {
             if (!clientSecret.equals(confirmClientSecret)) {
                 throw new PropertyException("Client secrets do not match");
             }
+            if (clientSecret.isBlank()) {
+                throw new PropertyException("Client secret must not be blank");
+            }
         } else {
             clientSecret = getFromEnv(clientSecretEnv);
         }
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/BootstrapAdminUser.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/BootstrapAdminUser.java
index 04177a37b13..b5a7a9f6703 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/BootstrapAdminUser.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/BootstrapAdminUser.java
@@ -78,6 +78,9 @@ public class BootstrapAdminUser extends AbstractNonServerCommand {
             if (!password.equals(confirmPassword)) {
                 throw new PropertyException("Passwords do not match");
             }
+            if (password.isBlank()) {
+                throw new PropertyException("Password must not be blank");
+            }
         } else {
             password = getFromEnv(passwordEnv);
         }