diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java
index 109ba30a..1e554b6a 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ContinuousQueryConfiguration.java
@@ -124,8 +124,7 @@ public class ContinuousQueryConfiguration extends AbstractAnnotationConfigSuppor
 				}
 				else if (isApplicationBean(bean, beanName)) {
 
-					//Object resolvedBean = resolveTargetObject(bean);
-					Object resolvedBean = bean;
+					Object resolvedBean = resolveTargetObject(bean);
 
 					List<ContinuousQueryDefinition> definitions = stream(resolvedBean.getClass().getMethods())
 						.filter(method -> method.isAnnotationPresent(ContinuousQuery.class))
@@ -151,7 +150,7 @@ public class ContinuousQueryConfiguration extends AbstractAnnotationConfigSuppor
 
 		return Optional.ofNullable(bean)
 			//.filter(this::isNotProxy)
-			//.map(this::resolveTargetObject)
+			.map(this::resolveTargetObject)
 			.map(Object::getClass)
 			.map(Class::getPackage)
 			.map(Package::getName)
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java
index bf4ba301..aea9ef0d 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationUnitTests.java
@@ -166,7 +166,6 @@ public class EnableContinuousQueriesConfigurationUnitTests {
 	@SuppressWarnings("unused")
 	static class TestContinuousQueryRegistrationAndExecutionOnProxiedBeanConfiguration {
 
-		/*
 		@Bean
 		BeanPostProcessor proxyTestContinuousQueryComponentPostProcessor() {
 
@@ -183,7 +182,6 @@ public class EnableContinuousQueriesConfigurationUnitTests {
 				}
 			};
 		}
-		*/
 
 		@Bean("People")
 		Region<Long, Person> mockPeopleRegion(GemFireCache gemfireCache,