om-768-fix.diff

diff --git a/src/main/om/next.cljc b/src/main/om/next.cljc
index ff19d99..3ea9682 100644
--- a/src/main/om/next.cljc
+++ b/src/main/om/next.cljc
@@ -2517,10 +2517,10 @@
               root (:root @state)]
           #?(:cljs
              (doseq [c ((:optimize config) cs)]
-               (let [props-change? (> (p/basis-t this) (t c))]
+               (let [props-change? (and (iquery? c) (> (p/basis-t this) (t c)))]
                  (when (mounted? c)
                    (let [computed   (get-computed (props c))
-                         next-raw-props (ui->props env c)
+                         next-raw-props (if (iquery? c) (ui->props env c) (props c))
                          next-props     (om.next/computed next-raw-props computed)]
                      (when (and (exists? (.-componentWillReceiveProps c))
                              (iquery? root)