diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchService.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchService.java
index 00b13e64e1..df04e070b2 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/ElasticSearchService.java
@@ -121,6 +121,7 @@ public class ElasticSearchService implements EntitySearchService, ElasticSearchI
 
     // Create an upsert document that will be used if the document doesn't exist
     Map<String, Object> upsert = new HashMap<>();
+    upsert.put("urn", urn.toString());
     upsert.put("runId", Collections.singletonList(runId));
 
     esWriteDAO.applyScriptUpdate(
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/ElasticSearchServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/ElasticSearchServiceTest.java
index c1ebbe87b5..b80e1219d4 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/ElasticSearchServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/ElasticSearchServiceTest.java
@@ -89,6 +89,7 @@ public class ElasticSearchServiceTest {
     // Verify upsert document
     Map<String, Object> capturedUpsert = upsertCaptor.getValue();
     assertEquals(capturedUpsert.get("runId"), Collections.singletonList(runId));
+    assertEquals(capturedUpsert.get("urn"), TEST_URN.toString());
   }
 
   @Test
@@ -121,6 +122,7 @@ public class ElasticSearchServiceTest {
 
     Map<String, Object> capturedUpsert = upsertCaptor.getValue();
     assertEquals(capturedUpsert.get("runId"), Collections.singletonList(null));
+    assertEquals(capturedUpsert.get("urn"), TEST_URN.toString());
   }
 
   @Test(expectedExceptions = NullPointerException.class)