diff --git a/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java b/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java
index e14f7994..4246dd0e 100644
--- a/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java
+++ b/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java
@@ -163,6 +163,10 @@ private void updateRegistry() {
         final Map<Service, ServiceFinder<T, R>> updatedFinders = new HashMap<>();
         try {
             val services = serviceDataSource.services();
+            if(services.isEmpty()) {
+                log.debug("No services found for the service data source. Skipping update on the registry");
+                return;
+            }
             val knownServiceFinders = finders.get();
             val newFinders = services.stream()
                     .filter(service -> !knownServiceFinders.containsKey(service))