diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/feeds/FeedResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/feeds/FeedResourceTest.java
index 884a1c46610..d8bb08bff90 100644
--- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/feeds/FeedResourceTest.java
+++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/feeds/FeedResourceTest.java
@@ -1638,7 +1638,7 @@ public class FeedResourceTest extends OpenMetadataApplicationTest {
     FeedResource.ThreadCountList threadCounts = listThreadsCount(entityLink, authHeaders);
     for (ThreadCount threadCount : threadCounts.getData()) {
       if (threadCount.getEntityLink().equalsIgnoreCase(entityLink)) {
-        return threadCount.getConversationCount();
+        return threadCount.getConversationCount() != null ? threadCount.getConversationCount() : 0;
       }
     }
     return 0;