diff --git a/src/main/frontend/db/async.cljs b/src/main/frontend/db/async.cljs
index 768c599a4e..3255cd4f7f 100644
--- a/src/main/frontend/db/async.cljs
+++ b/src/main/frontend/db/async.cljs
@@ -143,7 +143,7 @@
                               (remove empty?))]
              (when (seq tx-data) (d/transact! conn tx-data))
              (when-not skip-refresh?
-               (react/refresh-affected-queries! graph affected-keys))))
+               (react/refresh-affected-queries! graph affected-keys {:skip-kv-custom-keys? true}))))
 
          (if children-only? children block))
        (p/catch (fn [error]
diff --git a/src/main/frontend/db/react.cljs b/src/main/frontend/db/react.cljs
index 0a1581094a..207ca7d233 100644
--- a/src/main/frontend/db/react.cljs
+++ b/src/main/frontend/db/react.cljs
@@ -173,7 +173,8 @@
       (set-new-result! k result'))))
 
 (defn refresh-affected-queries!
-  [repo-url affected-keys]
+  [repo-url affected-keys & {:keys [skip-kv-custom-keys?]
+                             :or {skip-kv-custom-keys? false}}]
   (util/profile
    "refresh!"
    (let [db (conn/get-db repo-url)
@@ -186,7 +187,8 @@
                                 [k' cache]))) @query-state)
                     (into {}))
          all-keys (concat (distinct affected-keys)
-                          (filter #(contains? #{:custom :kv} (first %)) (keys state)))]
+                          (when-not skip-kv-custom-keys?
+                            (filter #(contains? #{:custom :kv} (first %)) (keys state))))]
      (doseq [k all-keys]
        (when-let [cache (get state k)]
          (let [{:keys [query query-fn]} cache