diff --git a/changelog/unreleased/kong/fix-key-auth-retain-query-order.yml b/changelog/unreleased/kong/fix-key-auth-retain-query-order.yml
new file mode 100644
index 000000000000..215e13153680
--- /dev/null
+++ b/changelog/unreleased/kong/fix-key-auth-retain-query-order.yml
@@ -0,0 +1,3 @@
+message: Fixed *key-auth* to retain order of query arguments when hiding the credentials.
+type: bugfix
+scope: Plugin
diff --git a/kong/plugins/key-auth/handler.lua b/kong/plugins/key-auth/handler.lua
index 73902e2e3bc4..89786aa7520a 100644
--- a/kong/plugins/key-auth/handler.lua
+++ b/kong/plugins/key-auth/handler.lua
@@ -143,8 +143,7 @@ local function do_authentication(conf)
       key = v
 
       if conf.hide_credentials then
-        query[name] = nil
-        kong.service.request.set_query(query)
+        kong.service.request.clear_query_arg(name)
         kong.service.request.clear_header(name)
 
         if conf.key_in_body then