diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java
index ad0f69b68193..cb1a204c3869 100644
--- a/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java
+++ b/sdk/spring/azure-spring-boot/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java
@@ -74,11 +74,10 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
      * @return true if the key vault is enabled, false otherwise.
      */
     private boolean isKeyVaultEnabled(ConfigurableEnvironment environment, String normalizedName) {
-        if (environment.getProperty(AZURE_KEYVAULT_PREFIX + normalizedName + AZURE_KEYVAULT_VAULT_URI) == null) {
-            return false;
-        }
-        return environment.getProperty(AZURE_KEYVAULT_PREFIX + normalizedName + AZURE_KEYVAULT_ENABLED,
-                Boolean.class, true) && isKeyVaultClientAvailable();
+        return environment.getProperty(
+            AZURE_KEYVAULT_PREFIX + normalizedName + AZURE_KEYVAULT_ENABLED, Boolean.class, true)
+            && environment.getProperty(AZURE_KEYVAULT_PREFIX + normalizedName + AZURE_KEYVAULT_VAULT_URI) != null
+            && isKeyVaultClientAvailable();
     }
 
     /**