diff --git a/src/ring/mock/request.clj b/src/ring/mock/request.clj
index c13b04a..2eb5b14 100644
--- a/src/ring/mock/request.clj
+++ b/src/ring/mock/request.clj
@@ -47,7 +47,7 @@
 
 (defn- combined-query [request params]
   (let [query (:query-string request)]
-    (when (or query params)
+    (when (or query (not-empty params))
       (string/join "&"
         (remove string/blank?
                 [query (encode-params params)])))))
diff --git a/test/ring/mock/request_test.clj b/test/ring/mock/request_test.clj
index d9e781b..ffb1804 100644
--- a/test/ring/mock/request_test.clj
+++ b/test/ring/mock/request_test.clj
@@ -127,7 +127,12 @@
     (is (= (-> {}
                (query-string {:a "b"})
                (query-string {:c "d"}))
-           {:query-string "c=d"}))))
+           {:query-string "c=d"})))
+  (testing "empty params is the same as nil, e.g no query string"
+    (is (= (:query-string (request :get "/" nil))
+           (:query-string (request :get "/" {}))
+           nil))))
+
 
 (deftest test-body
   (testing "string body"