diff --git a/src/main/om/next.cljc b/src/main/om/next.cljc
index 0e5d3b6c..201eb943 100644
--- a/src/main/om/next.cljc
+++ b/src/main/om/next.cljc
@@ -702,7 +702,10 @@
         tr (map #(bind-query % params))
         ret (cond
               (seq? query) (apply list (into [] tr query))
-              #?@(:clj [(instance? clojure.lang.IMapEntry query) (into [] tr query)])
+              ;; Note we use an empty vector rather than calling empty on
+              ;; query because MapEntries and PersistentVectors are captured by
+              ;; vector? but MapEntry does not empty to [].
+              (vector? query) (into [] tr query)
               (coll? query) (into (empty query) tr query)
               :else (replace-var query params))]
     (cond-> ret