diff --git a/frontend/src/uxbox/util/router.cljs b/frontend/src/uxbox/util/router.cljs
index b889be5f7..e2c073d47 100644
--- a/frontend/src/uxbox/util/router.cljs
+++ b/frontend/src/uxbox/util/router.cljs
@@ -126,7 +126,8 @@
             history (:history state)
             router  (:router state)]
         (rx/merge
-         (rx/of (on-change router (.getToken history)))
+         (->> (rx/of (on-change router (.getToken history)))
+              (rx/observe-on :asap))
          (->> (rx/create (fn [sink]
                            (let [key (e/listen history "navigate" #(sink (.-token %)))]
                              (fn []