diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 567770068..08e545b53 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -928,7 +928,9 @@ CLOCK is a cons cell of the form (MARKER START-TIME)."
 	;; contents, and leave point on the /next/ headline.  We store
 	;; the current entry location to be able to get back here when
 	;; we need to clock in again the previously clocked task.
-	(heading (org-with-point-at (car clock) (org-back-to-heading t))))
+	(heading (org-with-point-at (car clock)
+		   (org-back-to-heading t)
+		   (point-marker))))
     (pcase resolve-to
       (`nil
        (org-clock-clock-cancel clock)