diff --git a/lisp/org.el b/lisp/org.el
index d645897..a772743 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15530,7 +15530,7 @@ things up because then unnecessary parsing is avoided."
 	   (setq range (org-get-property-block beg end))
 	   (when range
 	     (goto-char (car range))
-	     (while (re-search-forward org-property-re
+	     (while (re-search-forward (org-re-property ".*?" 'literal t)
 				       (cdr range) t)
 	       (setq key (org-match-string-no-properties 2)
 		     value (org-trim (or (org-match-string-no-properties 3) "")))
@@ -15619,7 +15619,7 @@ If yes, return this value.  If not, return the current value of the variable."
 	(if (and range
 		 (goto-char (car range))
 		 (re-search-forward
-		  (org-re-property property)
+		  (org-re-property property nil t)
 		  (cdr range) t))
 	    (progn
 	      (delete-region (match-beginning 0) (1+ (point-at-eol)))