diff --git a/frontend/src/app/util/router.cljs b/frontend/src/app/util/router.cljs
index 0fc55dc8f..d7945580d 100644
--- a/frontend/src/app/util/router.cljs
+++ b/frontend/src/app/util/router.cljs
@@ -84,12 +84,13 @@
 
     ptk/EffectEvent
     (effect [_ state stream]
-      (let [router  (:router state)
-            history (:history state)
-            path    (resolve router id params qparams)]
-        (if ^boolean replace
-          (bhistory/replace-token! history path)
-          (bhistory/set-token! history path))))))
+      (ts/asap
+       #(let [router  (:router state)
+              history (:history state)
+              path    (resolve router id params qparams)]
+          (if ^boolean replace
+            (bhistory/replace-token! history path)
+            (bhistory/set-token! history path)))))))
 
 (defn nav
   ([id] (nav id nil nil))