diff --git a/init.el b/init.el
index a62d645..15d6ded 100644
--- a/init.el
+++ b/init.el
@@ -1254,7 +1254,7 @@ respectively."
                  (file db/org-default-refile-file)
                  ,(concat "* DONE [#B] %^{What}\nCLOSED: %U\n"
                           ":PROPERTIES:\n:CREATED: %U\n:END:\n"
-                          "\nInterrupted %K\n\n%?")
+                          "\nInterrupted %(with-temp-buffer (db/org-add-link-to-current-clock) (buffer-string))\n\n%?")
                  :clock-in t :clock-resume t :empty-lines-after 1)
                 ("r" "respond"
                  entry
diff --git a/site-lisp/db-org.el b/site-lisp/db-org.el
index d3a883e..97df017 100644
--- a/site-lisp/db-org.el
+++ b/site-lisp/db-org.el
@@ -956,11 +956,8 @@ variables `org-agenda-files' and
 
 (defun db/org-add-link-to-current-clock ()
   "Insert link to currently clocked-in item at point.
-Error out when not in an Org Mode buffer or when the clock is not
-active."
+Error out when the clock is not active."
   (interactive)
-  (unless (derived-mode-p 'org-mode)
-    (user-error "Not in Org Mode, aborting"))
   (unless org-clock-marker
     (user-error "No clocked-in task, aborting"))
   (db/org-insert-link-to-pom org-clock-marker))