diff --git a/lisp/org.el b/lisp/org.el
index f383f99e5..798a8b7ef 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5151,6 +5151,8 @@ This includes angle, plain, and bracket links."
     (while (re-search-forward org-link-any-re limit t)
       (let* ((start (match-beginning 0))
 	     (end (match-end 0))
+	     (visible-start (or (match-beginning 4) (match-beginning 2)))
+	     (visible-end (or (match-end 4) (match-end 2)))
 	     (style (cond ((eq ?< (char-after start)) 'angle)
 			  ((eq ?\[ (char-after (1+ start))) 'bracket)
 			  (t 'plain))))
@@ -5200,9 +5202,7 @@ This includes angle, plain, and bracket links."
 		     (append `(invisible
 			       ,(or (org-link-get-parameter type :display)
 				    'org-link))
-			     properties))
-		    (visible-start (or (match-beginning 3) (match-beginning 2)))
-		    (visible-end (or (match-end 3) (match-end 2))))
+			     properties)))
 		(add-text-properties start visible-start hidden)
 		(add-text-properties visible-start visible-end properties)
 		(add-text-properties visible-end end hidden)