diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs
index 0df35c4bb..771b51951 100644
--- a/src/main/frontend/db/model.cljs
+++ b/src/main/frontend/db/model.cljs
@@ -596,7 +596,7 @@
 (defn get-block-parents-v2
   [repo block-id]
   (d/pull (conn/get-conn repo)
-          '[:db/id :block/properties {:block/parent ...}]
+          '[:db/id :block/collapsed? :block/properties {:block/parent ...}]
           [:block/uuid block-id]))
 
 (defn parents-collapsed?
diff --git a/src/main/frontend/handler/block.cljs b/src/main/frontend/handler/block.cljs
index 43e2dbd07..7d08ae84e 100644
--- a/src/main/frontend/handler/block.cljs
+++ b/src/main/frontend/handler/block.cljs
@@ -16,18 +16,6 @@
   [repo page-id]
   (>= (db/get-page-blocks-count repo page-id) initial-blocks-length))
 
-(defn get-block-ids
-  [block]
-  (let [ids (atom [])
-        _ (walk/prewalk
-           (fn [form]
-             (when (map? form)
-               (when-let [id (:block/uuid form)]
-                 (swap! ids conj id)))
-             form)
-           block)]
-    @ids))
-
 (defn get-block-refs-with-children
   [block]
   (->>
diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index caaa72801..12bee4897 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -3492,7 +3492,7 @@
         :skip-transact? false}
        (doseq [block-id block-ids]
          (when-let [block (db/entity [:block/uuid block-id])]
-          (let [current-value (boolean (util/collapsed? block))]
+           (let [current-value (:block/collapsed? block)]
             (when-not (= current-value value)
               (let [block (outliner-core/block {:block/uuid block-id
                                                 :block/collapsed? value})]