diff --git a/deps/graph-parser/src/logseq/graph_parser/block.cljs b/deps/graph-parser/src/logseq/graph_parser/block.cljs
index 01f67a619b..131bda86fb 100644
--- a/deps/graph-parser/src/logseq/graph_parser/block.cljs
+++ b/deps/graph-parser/src/logseq/graph_parser/block.cljs
@@ -666,7 +666,8 @@
   [page-id blocks]
   (let [[blocks other-blocks] (split-with
                                (fn [b]
-                                 (not= "macro" (:block/type b)))
+                                 (or (not= "macro" (:block/type b))
+                                     (whiteboard-properties? (:block/properties b))))
                                 blocks)
         result (loop [blocks (map (fn [block] (assoc block :block/level-spaces (:block/level block))) blocks)
                       parents [{:page/id page-id     ; db id or a map {:block/name "xxx"}
diff --git a/src/main/frontend/handler/whiteboard.cljs b/src/main/frontend/handler/whiteboard.cljs
index 7f2266b9a9..0674944c43 100644
--- a/src/main/frontend/handler/whiteboard.cljs
+++ b/src/main/frontend/handler/whiteboard.cljs
@@ -189,6 +189,7 @@
     (remove model/whiteboard-shape? blocks)))
 
 (defn- get-last-root-block
+  "Get the last root Logseq block in the page. Main purpose is to calculate the new :block/left id"
   [page-name]
   (let [page-id (:db/id (model/get-page page-name))
         blocks (get-whiteboard-blocks page-name)