diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java
index 515c1fc3d..f4d3c0626 100644
--- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmSecretService.java
@@ -163,7 +163,7 @@ public class KsmSecretService implements VaultSecretService {
 
                 // If the user config happens to be the same as admin-defined one,
                 // don't bother trying again
-                if (!Objects.equal(userKsmConfig, ksmConfig))
+                if (userKsmConfig != null && !Objects.equal(userKsmConfig, ksmConfig))
                     return getClient(userKsmConfig).getSecret(name);
 
                 return CompletableFuture.completedFuture(null);