diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java
index a47c6d411..8d6dab672 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinder.java
@@ -122,7 +122,7 @@ private boolean isRefreshScoped(String beanName) {
 				}
 			}
 		}
-		if (this.refreshScope == null) {
+		if (beanName == null || this.refreshScope == null) {
 			return false;
 		}
 		return this.beanFactory.containsBeanDefinition(beanName)