diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java
index d37149a872e..73caff3955d 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java
@@ -26,8 +26,10 @@ public record TestCaseIndex(TestCase testCase) implements SearchIndex {
   public void removeNonIndexableFields(Map<String, Object> esDoc) {
     SearchIndex.super.removeNonIndexableFields(esDoc);
     List<Map<String, Object>> testSuites = (List<Map<String, Object>>) esDoc.get("testSuites");
-    for (Map<String, Object> testSuite : testSuites) {
-      SearchIndexUtils.removeNonIndexableFields(testSuite, excludeFields);
+    if (testSuites != null) {
+      for (Map<String, Object> testSuite : testSuites) {
+        SearchIndexUtils.removeNonIndexableFields(testSuite, excludeFields);
+      }
     }
   }
 
diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestCaseResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestCaseResourceTest.java
index af6e6da9ed3..803727ec113 100644
--- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestCaseResourceTest.java
+++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestCaseResourceTest.java
@@ -2049,6 +2049,12 @@ public class TestCaseResourceTest extends EntityResourceTest<TestCase, CreateTes
     assertNull(doc.get("changeDescription"));
     List<Map<String, Object>> testSuites = (List<Map<String, Object>>) doc.get("testSuites");
     assertNull(testSuites.get(0).get("changeDescription"));
+
+    // Remove changeDescription logic handles null testSuites
+    testCase.setTestSuites(null);
+    doc = JsonUtils.convertValue(testCase, Map.class);
+    testCaseIndex = new TestCaseIndex(testCase);
+    testCaseIndex.removeNonIndexableFields(doc);
   }
 
   public void deleteTestCaseResult(String fqn, Long timestamp, Map<String, String> authHeaders)