diff --git a/processing/src/main/java/io/druid/query/BaseQuery.java b/processing/src/main/java/io/druid/query/BaseQuery.java
index edb1ca5bf32e..0186e00075ab 100644
--- a/processing/src/main/java/io/druid/query/BaseQuery.java
+++ b/processing/src/main/java/io/druid/query/BaseQuery.java
@@ -176,12 +176,6 @@ public Query withId(String id)
     return withOverriddenContext(ImmutableMap.<String, Object>of(QUERYID, id));
   }
 
-  @Override
-  public Query<T> withDefaultTimeout(long defaultTimeout)
-  {
-    return withOverriddenContext(ImmutableMap.of(QueryContexts.DEFAULT_TIMEOUT_KEY, defaultTimeout));
-  }
-
   @Override
   public boolean equals(Object o)
   {
diff --git a/processing/src/main/java/io/druid/query/Query.java b/processing/src/main/java/io/druid/query/Query.java
index cfbf6f2d3403..9ad178161ead 100644
--- a/processing/src/main/java/io/druid/query/Query.java
+++ b/processing/src/main/java/io/druid/query/Query.java
@@ -99,6 +99,4 @@ public interface Query<T>
   String getId();
 
   Query<T> withDataSource(DataSource dataSource);
-
-  Query<T> withDefaultTimeout(long defaultTimeout);
 }
diff --git a/processing/src/main/java/io/druid/query/QueryContexts.java b/processing/src/main/java/io/druid/query/QueryContexts.java
index b59c6bc2a2b7..5a0409e430d4 100644
--- a/processing/src/main/java/io/druid/query/QueryContexts.java
+++ b/processing/src/main/java/io/druid/query/QueryContexts.java
@@ -20,6 +20,7 @@
 package io.druid.query;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
 import io.druid.java.util.common.ISE;
 
 public class QueryContexts
@@ -114,6 +115,11 @@ public static <T> long getTimeout(Query<T> query, long defaultTimeout)
     return timeout;
   }
 
+  public static <T> Query<T> withDefaultTimeout(Query<T> query, long defaultTimeout)
+  {
+    return query.withOverriddenContext(ImmutableMap.of(QueryContexts.DEFAULT_TIMEOUT_KEY, defaultTimeout));
+  }
+
   static <T> long getDefaultTimeout(Query<T> query)
   {
     final long defaultTimeout = parseLong(query, DEFAULT_TIMEOUT_KEY, DEFAULT_TIMEOUT_MILLIS);
diff --git a/processing/src/test/java/io/druid/query/QueryContextsTest.java b/processing/src/test/java/io/druid/query/QueryContextsTest.java
index c656f0771101..79a7ebf992d4 100644
--- a/processing/src/test/java/io/druid/query/QueryContextsTest.java
+++ b/processing/src/test/java/io/druid/query/QueryContextsTest.java
@@ -106,7 +106,7 @@ public void testEmptyQueryTimeout()
     );
     Assert.assertEquals(300_000, QueryContexts.getTimeout(query));
 
-    query = query.withDefaultTimeout(60_000);
+    query = QueryContexts.withDefaultTimeout(query, 60_000);
     Assert.assertEquals(60_000, QueryContexts.getTimeout(query));
   }
 
@@ -121,7 +121,7 @@ public void testQueryTimeout()
     );
     Assert.assertEquals(1000, QueryContexts.getTimeout(query));
 
-    query = query.withDefaultTimeout(1_000_000);
+    query = QueryContexts.withDefaultTimeout(query, 1_000_000);
     Assert.assertEquals(1000, QueryContexts.getTimeout(query));
   }
 }
diff --git a/server/src/main/java/io/druid/server/QueryResource.java b/server/src/main/java/io/druid/server/QueryResource.java
index 554cc34de83c..45fcd98dff18 100644
--- a/server/src/main/java/io/druid/server/QueryResource.java
+++ b/server/src/main/java/io/druid/server/QueryResource.java
@@ -40,6 +40,7 @@
 import io.druid.query.DruidMetrics;
 import io.druid.query.GenericQueryMetricsFactory;
 import io.druid.query.Query;
+import io.druid.query.QueryContexts;
 import io.druid.query.QueryInterruptedException;
 import io.druid.query.QueryMetrics;
 import io.druid.query.QuerySegmentWalker;
@@ -190,7 +191,7 @@ public Response doPost(
         queryId = UUID.randomUUID().toString();
         query = query.withId(queryId);
       }
-      query = query.withDefaultTimeout(config.getDefaultQueryTimeout());
+      query = QueryContexts.withDefaultTimeout(query, config.getDefaultQueryTimeout());
 
       toolChest = warehouse.getToolChest(query);