diff --git a/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java b/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
+++ b/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
@@ -658,7 +658,11 @@ public class DefaultCacheManager implements EmbeddedCacheManager, CacheManager {
 
    @Override
    public Configuration getCacheConfiguration(String name) {
-      return configurationOverrides.get(name);
+      Configuration configuration = configurationOverrides.get(name);
+      if (configuration == null && cacheExists(name)) {
+         return defaultConfiguration;
+      }
+      return configuration;
    }
 
    @Override
ISPN-<I> Compatibility Mode tests didn't shutdown all the cache managers