diff --git a/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java b/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java
index 318d8215..ffb138b0 100644
--- a/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java
@@ -125,7 +125,10 @@ public class GemfireBeanFactoryLocator implements BeanFactoryLocator, BeanFactor
 		}
 
 		if (beanFactory == defaultFactory) {
-			defaultFactory = null;
+			synchronized (GemfireBeanFactoryLocator.class) {
+				defaultFactory = null;
+				canUseDefaultBeanFactory = beanFactories.isEmpty();
+			}
 		}
 	}