diff --git a/webserver-configs/Caddyfile b/webserver-configs/Caddyfile
index 9d3b43760..bc3862774 100644
--- a/webserver-configs/Caddyfile
+++ b/webserver-configs/Caddyfile
@@ -29,5 +29,5 @@ status 403 /403
 
 # global rewrite should come last.
 rewrite {
-    to  {path} {path}/ /index.php?_url={uri}
+    to  {path} {path}/ /index.php?_url={uri}&{query}
 }
diff --git a/webserver-configs/Caddyfile-0.8.x b/webserver-configs/Caddyfile-0.8.x
index 520eafb42..f3ba77a25 100644
--- a/webserver-configs/Caddyfile-0.8.x
+++ b/webserver-configs/Caddyfile-0.8.x
@@ -29,5 +29,5 @@ rewrite {
 
 # global rewrite should come last.
 rewrite {
-    to  {path} {path}/ /index.php?_url={uri}
+    to  {path} {path}/ /index.php?_url={uri}&{query}
 }