diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java
index 345b21d03887e..da936a76ee1ca 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java
@@ -80,7 +80,6 @@ public void collect(int doc, long bucket) throws IOException {
 
                 leafMapScript.setDocument(doc);
                 leafMapScript.execute();
-                CollectionUtils.ensureNoSelfReferences(aggState, "Scripted metric aggs map script");
             }
         };
     }
@@ -103,4 +102,10 @@ public InternalAggregation buildEmptyAggregation() {
         return new InternalScriptedMetric(name, null, reduceScript, pipelineAggregators(), metaData());
     }
 
+    @Override
+    protected void doPostCollection() throws IOException {
+        CollectionUtils.ensureNoSelfReferences(aggState, "Scripted metric aggs map script");
+
+        super.doPostCollection();
+    }
 }