diff --git a/modules/reitit-frontend/src/reitit/frontend.cljs b/modules/reitit-frontend/src/reitit/frontend.cljs
index 2f099fcb..dd29697a 100644
--- a/modules/reitit-frontend/src/reitit/frontend.cljs
+++ b/modules/reitit-frontend/src/reitit/frontend.cljs
@@ -23,12 +23,9 @@
       (let [q (query-params uri)
             ;; Return uncoerced values if coercion is not enabled - so
             ;; that tha parameters are always accessible from same property.
-            ;; FIXME: coerce! can't be used as it doesn't take query-params
-            parameters (if (:result match)
-                         (coercion/coerce-request (:result match) {:query-params q
-                                                                   :path-params (:path-params match)})
-                         {:query q
-                          :path (:path-params match)})]
+            parameters (or (coercion/coerce! (assoc match :query-params q))
+                           {:path (:path-params match)
+                            :query q})]
         (assoc match :parameters parameters)))))
 
 (defn match-by-name