diff --git a/src/uxbox/ui/mixins.cljs b/src/uxbox/ui/mixins.cljs
index 6f3a9c827..e29e84915 100644
--- a/src/uxbox/ui/mixins.cljs
+++ b/src/uxbox/ui/mixins.cljs
@@ -119,8 +119,9 @@
       (let [local-state (atom initial)
             component   (:rum/react-component state)]
         (add-watch local-state key
-                   (fn [_ _ _ _]
-                     (rum/request-render component)))
+                   (fn [_ _ oldv newv]
+                     (when (not= oldv newv)
+                       (rum/request-render component))))
         (assoc state key local-state)))
     }))