diff --git a/collects/web-server/private/request.ss b/collects/web-server/private/request.ss
index d522ba9f04..cbbdb6d6ca 100644
--- a/collects/web-server/private/request.ss
+++ b/collects/web-server/private/request.ss
@@ -188,11 +188,11 @@
                   (if (or (= amp-end len) (eq? (bytes-ref raw amp-end) (char->integer #\&)))
                       (list* (make-binding:form
                               (string->bytes/utf-8
-                               (uri-decode
+                               (form-urlencoded-decode
                                 (bytes->string/utf-8
                                  (subbytes raw start key-end))))
                               (string->bytes/utf-8
-                               (uri-decode
+                               (form-urlencoded-decode
                                 (bytes->string/utf-8
                                  (subbytes raw (add1 key-end) amp-end)))))
                             (loop (add1 amp-end)))