diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index a715ad5cb..ace8cfb0e 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -2818,7 +2818,8 @@
      {:block b :level 2}
      {:block e :level 2}]"
   [{:keys [collapse?] :or {collapse? false}}]
-  (let [page (state/get-current-page)]
+  (when-let [page (or (state/get-current-page)
+                      (date/today))]
     (->>
      (-> page
          (db/get-page-blocks-no-cache)
diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs
index d451363eb..d2f0b92f7 100644
--- a/src/main/frontend/state.cljs
+++ b/src/main/frontend/state.cljs
@@ -141,8 +141,7 @@
 
 (defn get-current-page
   []
-  (and
-   (= :page (get-current-route))
+  (when (= :page (get-current-route))
    (get-in (get-route-match)
            [:path-params :name])))