diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 03bb69e9f..a3bf996ea 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3538,9 +3538,10 @@ generating a new one."
 	(org-agenda-dim-blocked-tasks))
       ;; We need to widen when `org-agenda-finalize' is called from
       ;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in')
-      (save-restriction
-      	(widen)
-	(org-agenda-mark-clocking-task))
+      (when org-clock-current-task
+	(save-restriction
+	  (widen)
+	  (org-agenda-mark-clocking-task)))
       (when org-agenda-entry-text-mode
 	(org-agenda-entry-text-hide)
 	(org-agenda-entry-text-show))