diff --git a/lisp/org-list.el b/lisp/org-list.el
index 628dd0a7b..80ccc161e 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -2836,7 +2836,7 @@ ignores hidden links."
 			 ((= dcst ?t) '<)))
 	     (next-record (lambda ()
 			    (skip-chars-forward " \r\t\n")
-			    (beginning-of-line)))
+			    (or (eobp) (beginning-of-line))))
 	     (end-record (lambda ()
 			   (goto-char (org-list-get-item-end-before-blank
 				       (point) struct))))