diff --git a/init.el b/init.el
index 976025d..b3c24ac 100644
--- a/init.el
+++ b/init.el
@@ -572,6 +572,7 @@ search commands like `db/helm-shortcuts’."
              db/turn-off-local-electric-pair-mode
              db/org-cleanup-continuous-clocks
              db/find-csv-in-org
+             db/org-mark-current-default-task
              db/export-diary
              db/add-symbols-to-TeX-input-method
              db/two-monitors-xrandr
@@ -884,12 +885,7 @@ search commands like `db/helm-shortcuts’."
   :config (progn
             (org-clock-persistence-insinuate)
 
-            (add-hook 'org-clock-in-hook ; mark current default task
-                      (lambda ()
-                        (let ((current-id (org-id-get org-clock-marker)))
-                          (when (member current-id (list org-working-task-id
-                                                         org-home-task-id))
-                            (org-clock-mark-default-task)))))
+            (add-hook 'org-clock-in-hook #'db/org-mark-current-default-task)
 
             ;; Clock in default task if no other task is given
             (add-hook 'org-clock-out-hook #'db/ensure-running-clock 'append)
diff --git a/site-lisp/db-utils.el b/site-lisp/db-utils.el
index e0c7a06..749f4d5 100644
--- a/site-lisp/db-utils.el
+++ b/site-lisp/db-utils.el
@@ -444,6 +444,15 @@ by passing a universal argument."
     (org-mode)
     (org-table-convert-region (point-min) (point-max) separator)))
 
+(defun db/org-mark-current-default-task ()
+  "Mark current task as default when equal to work task or home task.
+Work task and home task are determined by the current values of
+`org-working-task-id’ and `org-home-task-id’, respectively."
+  (let ((current-id (org-id-get org-clock-marker)))
+    (when (member current-id (list org-working-task-id
+                                   org-home-task-id))
+      (org-clock-mark-default-task))))
+
 
 ;;; Calendar