diff --git a/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java b/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java
index 4302b8692f82936fff3045cf15a70ad11d3b8643..5d1dc796b6be1b57520688db5d871b9d5d0255c4 100644
--- a/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java
+++ b/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java
@@ -239,6 +239,11 @@ public class AsyncQueryForwardingServlet extends HttpServlet
 
   private String makeUrl(String host, HttpServletRequest req)
   {
+    String queryString = req.getQueryString();
+
+    if (queryString == null) {
+      return String.format("http://%s%s", host, req.getRequestURI());
+    }
     return String.format("http://%s%s?%s", host, req.getRequestURI(), req.getQueryString());
   }
 }