diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java
index 143190acfc2..7e2f61cdc72 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java
@@ -756,10 +756,9 @@ public class SearchIndexApp extends AbstractNativeApplication {
 
   private void waitForConsumersToComplete(CountDownLatch consumerLatch)
       throws InterruptedException {
-    boolean finished = consumerLatch.await(5, TimeUnit.MINUTES);
-    if (!finished) {
-      LOG.warn("Consumers did not finish within timeout");
-    }
+    LOG.info("Waiting for all consumers to complete their work...");
+    consumerLatch.await(); // Wait indefinitely for consumers to finish all work
+    LOG.info("All consumers have completed their work");
   }
 
   private void handleInterruption(InterruptedException e) throws InterruptedException {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/socket/WebSocketManager.java b/openmetadata-service/src/main/java/org/openmetadata/service/socket/WebSocketManager.java
index daa161d3460..ded1e4e5d14 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/socket/WebSocketManager.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/socket/WebSocketManager.java
@@ -108,7 +108,7 @@ public class WebSocketManager {
             userSocketConnections =
                 activityFeedEndpoints.containsKey(id)
                     ? activityFeedEndpoints.get(id)
-                    : new HashMap<>();
+                    : new ConcurrentHashMap<>();
             userSocketConnections.put(socket.getId(), socket);
             activityFeedEndpoints.put(id, userSocketConnections);
           }