diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index a9fe2b7e6..351f92b16 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -1066,8 +1066,10 @@ Use \"export %s\" instead"
 	  (`keyword
 	   (when (string= (org-element-property :key datum) "PROPERTY")
 	     (let ((value (org-element-property :value datum)))
-	       (when (string-match "\\`header-args\\(?::\\(\\S-+\\)\\)?\\+? *"
-				   value)
+	       (when (or (string-match "\\`header-args\\(?::\\(\\S-+\\)\\)?\\+ *"
+				       value)
+                         (string-match "\\`header-args\\(?::\\(\\S-+\\)\\)? *"
+				       value))
 		 (funcall verify
 			  datum
 			  (match-string 1 value)
@@ -1076,8 +1078,10 @@ Use \"export %s\" instead"
 	  (`node-property
 	   (let ((key (org-element-property :key datum)))
 	     (when (let ((case-fold-search t))
-		     (string-match "\\`HEADER-ARGS\\(?::\\(\\S-+\\)\\)?\\+?"
-				   key))
+		     (or (string-match "\\`HEADER-ARGS\\(?::\\(\\S-+\\)\\)?\\+"
+				       key)
+                         (string-match "\\`HEADER-ARGS\\(?::\\(\\S-+\\)\\)?"
+				       key)))
 	       (funcall verify
 			datum
 			(match-string 1 key)