diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index a5636e215..87c9cd216 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2798,7 +2798,9 @@ PROPERTIES: The list properties specified in the `:properties' parameter
 	  (when (and time (> time 0) (org-at-heading-p))
 	    (let ((level (org-reduced-level (org-current-level))))
 	      (when (<= level maxlevel)
-		(let* ((headline (org-get-heading t t t t))
+		(let* ((headline (replace-regexp-in-string
+				  (format "\\`%s[ \t]+" org-comment-string) ""
+				  (nth 4 (org-heading-components))))
 		       (hdl
 			(if (not link) headline
 			  (let ((search