diff --git a/processing/src/main/java/io/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java b/processing/src/main/java/io/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java
index cd1a60e72fc..c826ce2333b 100644
--- a/processing/src/main/java/io/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java
+++ b/processing/src/main/java/io/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java
@@ -65,7 +65,7 @@ public class AggregateTopNMetricFirstAlgorithm implements TopNAlgorithm<int[], T
   }
 
   @Override
-  public TopNResultBuilder makeResultBuilder(TopNParams params)
+  public TopNResultBuilder makeResultBuilder(TopNParams params, TopNQuery query)
   {
     return query.getTopNMetricSpec().getResultBuilder(
         params.getCursor().getTime(),
@@ -82,7 +82,6 @@ public class AggregateTopNMetricFirstAlgorithm implements TopNAlgorithm<int[], T
       TopNParams params, TopNResultBuilder resultBuilder, int[] ints
   )
   {
-    final TopNResultBuilder singleMetricResultBuilder = makeResultBuilder(params);
     final String metric;
     // ugly
     TopNMetricSpec spec = query.getTopNMetricSpec();
@@ -128,6 +127,7 @@ public class AggregateTopNMetricFirstAlgorithm implements TopNAlgorithm<int[], T
                                                         .aggregators(condensedAggs)
                                                         .postAggregators(condensedPostAggs)
                                                         .build();
+    final TopNResultBuilder singleMetricResultBuilder = makeResultBuilder(params, singleMetricQuery);
 
     PooledTopNAlgorithm singleMetricAlgo = new PooledTopNAlgorithm(capabilities, singleMetricQuery, bufferPool);
     PooledTopNAlgorithm.PooledTopNParams singleMetricParam = null;
diff --git a/processing/src/main/java/io/druid/query/topn/DimExtractionTopNAlgorithm.java b/processing/src/main/java/io/druid/query/topn/DimExtractionTopNAlgorithm.java
index ba6aefb5adf..547d5e25ca4 100644
--- a/processing/src/main/java/io/druid/query/topn/DimExtractionTopNAlgorithm.java
+++ b/processing/src/main/java/io/druid/query/topn/DimExtractionTopNAlgorithm.java
@@ -57,7 +57,7 @@ public class DimExtractionTopNAlgorithm extends BaseTopNAlgorithm<Aggregator[][]
   }
 
   @Override
-  public TopNResultBuilder makeResultBuilder(TopNParams params)
+  public TopNResultBuilder makeResultBuilder(TopNParams params, TopNQuery query)
   {
     return query.getTopNMetricSpec().getResultBuilder(
         params.getCursor().getTime(),
diff --git a/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java b/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java
index 6dd44d0a4a8..50e5f6e7a95 100644
--- a/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java
+++ b/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java
@@ -115,7 +115,7 @@ public class PooledTopNAlgorithm
   }
 
   @Override
-  public TopNResultBuilder makeResultBuilder(PooledTopNParams params)
+  public TopNResultBuilder makeResultBuilder(PooledTopNParams params, TopNQuery query)
   {
     return query.getTopNMetricSpec().getResultBuilder(
         params.getCursor().getTime(),
diff --git a/processing/src/main/java/io/druid/query/topn/TopNAlgorithm.java b/processing/src/main/java/io/druid/query/topn/TopNAlgorithm.java
index 89bac871441..49496e8f080 100644
--- a/processing/src/main/java/io/druid/query/topn/TopNAlgorithm.java
+++ b/processing/src/main/java/io/druid/query/topn/TopNAlgorithm.java
@@ -33,7 +33,7 @@ public interface TopNAlgorithm<DimValSelector, Parameters extends TopNParams>
 
   public TopNParams makeInitParams(DimensionSelector dimSelector, Cursor cursor);
 
-  public TopNResultBuilder makeResultBuilder(Parameters params);
+  public TopNResultBuilder makeResultBuilder(Parameters params, TopNQuery query);
 
   public void run(
       Parameters params,
diff --git a/processing/src/main/java/io/druid/query/topn/TopNMapFn.java b/processing/src/main/java/io/druid/query/topn/TopNMapFn.java
index c013d546f7f..c51b63cd539 100644
--- a/processing/src/main/java/io/druid/query/topn/TopNMapFn.java
+++ b/processing/src/main/java/io/druid/query/topn/TopNMapFn.java
@@ -52,7 +52,7 @@ public class TopNMapFn implements Function<Cursor, Result<TopNResultValue>>
     try {
       params = topNAlgorithm.makeInitParams(dimSelector, cursor);
 
-      TopNResultBuilder resultBuilder = topNAlgorithm.makeResultBuilder(params);
+      TopNResultBuilder resultBuilder = topNAlgorithm.makeResultBuilder(params, query);
 
       topNAlgorithm.run(params, resultBuilder, null);