diff --git a/notification-core-plus/src/main/java/org/opengroup/osdu/notification/CorePlusApplication.java b/notification-core-plus/src/main/java/org/opengroup/osdu/notification/CorePlusApplication.java
index 940fb9054d5c83f540474932204d8a697740eb9d..9aa9c5dd0eab107e768dd91323bbdc26b16b2a9a 100644
--- a/notification-core-plus/src/main/java/org/opengroup/osdu/notification/CorePlusApplication.java
+++ b/notification-core-plus/src/main/java/org/opengroup/osdu/notification/CorePlusApplication.java
@@ -16,14 +16,22 @@
 
 package org.opengroup.osdu.notification;
 
+import org.opengroup.osdu.notification.api.PubsubEndpoint;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
-@ComponentScan(value = {"org.opengroup.osdu"})
+@ComponentScan(value = {"org.opengroup.osdu"}, excludeFilters = {
+		@ComponentScan.Filter(
+				type = FilterType.ASSIGNABLE_TYPE,
+				value = {
+						PubsubEndpoint.class
+			})
+})
 @EnableAsync
 @PropertySource("classpath:swagger.properties")
 public class CorePlusApplication {