diff --git a/lisp/org.el b/lisp/org.el
index 3a5eb5177..775d5dd85 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9290,7 +9290,7 @@ property to set."
 	   (save-excursion
 	     (org-back-to-heading t)
 	     (put-text-property
-	      (point-at-bol) (outline-next-heading) tprop p))))))))
+	      (point-at-bol) (or (outline-next-heading) (point-max)) tprop p))))))))
 
 
 ;;;; Link Stuff