diff --git a/src/main/frontend/commands.cljs b/src/main/frontend/commands.cljs
index c71941d85b..0cb938fc38 100644
--- a/src/main/frontend/commands.cljs
+++ b/src/main/frontend/commands.cljs
@@ -554,7 +554,7 @@
                     (count (util/safe-re-find re-pattern prefix))))
             new-value (str (subs edit-content 0 pos)
                            (string/replace-first (subs edit-content pos)
-                                                 (marker/marker-pattern)
+                                                 (marker/marker-pattern format)
                                                  (str marker " ")))]
         (state/set-edit-content! input-id new-value)
         (let [new-pos (compute-pos-delta-when-change-marker
diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index 38b038b1ba..2b786299a2 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -339,8 +339,9 @@
   [block value]
   (if (and (state/enable-timetracking?)
            (not= (:block/content block) value))
-    (let [new-marker (last (util/safe-re-find (marker/marker-pattern) (or value "")))
-          new-value (with-marker-time value block (:block/format block)
+    (let [format (:block/format block)
+          new-marker (last (util/safe-re-find (marker/marker-pattern format) (or value "")))
+          new-value (with-marker-time value block format
                       new-marker
                       (:block/marker block))]
       new-value)
diff --git a/src/main/frontend/util/marker.cljs b/src/main/frontend/util/marker.cljs
index 5f7499478f..b87805d913 100644
--- a/src/main/frontend/util/marker.cljs
+++ b/src/main/frontend/util/marker.cljs
@@ -1,15 +1,11 @@
 (ns frontend.util.marker
   (:require [clojure.string :as string]
-            [frontend.util :as util]
-            [frontend.db :as db]
-            [frontend.state :as state]))
+            [frontend.util :as util]))
 
-(defn marker-pattern []
-  (let [format (or (db/get-page-format (state/get-current-page))
-                   (state/get-preferred-format))]
-    (re-pattern
-     (str "^" (when-not (= format :org) "(#*\\s*)?")
-          "(NOW|LATER|TODO|DOING|DONE|WAITING|WAIT|CANCELED|CANCELLED|STARTED|IN-PROGRESS)?\\s?"))))
+(defn marker-pattern [format]
+  (re-pattern
+   (str "^" (when-not (= format :org) "(#*\\s*)?")
+        "(NOW|LATER|TODO|DOING|DONE|WAITING|WAIT|CANCELED|CANCELLED|STARTED|IN-PROGRESS)?\\s?")))
 
 (def bare-marker-pattern
   #"(NOW|LATER|TODO|DOING|DONE|WAITING|WAIT|CANCELED|CANCELLED|STARTED|IN-PROGRESS){1}\s+")
@@ -28,7 +24,7 @@
         new-content
         (str (subs content 0 pos)
              (string/replace-first (subs content pos)
-                                   (marker-pattern)
+                                   (marker-pattern format)
                                    (str marker " ")))]
     new-content))