diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 798ef1a10..bc7002fd0 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -10276,7 +10276,8 @@ ARG is passed through to `org-deadline'."
   (unless (marker-buffer org-clock-marker)
     (user-error "No running clock"))
   (org-with-remote-undo (marker-buffer org-clock-marker)
-    (org-clock-cancel)))
+    (org-clock-cancel))
+  (org-agenda-unmark-clocking-task))
 
 (defun org-agenda-clock-goto ()
   "Jump to the currently clocked in task within the agenda.