diff --git a/includes/CommentFormatter.php b/includes/CommentFormatter.php
index 3f0ec7f48..2057b752b 100644
--- a/includes/CommentFormatter.php
+++ b/includes/CommentFormatter.php
@@ -214,7 +214,7 @@ class CommentFormatter {
 	) : string {
 		$doc = new DOMDocument();
 		$text = preg_replace_callback(
-			'/<!--__DTSUBSCRIBE__(.*)-->/',
+			'/<!--__DTSUBSCRIBE__(.*?)-->/',
 			function ( $matches ) use ( $doc, $subscriptionStore, $user ) {
 				$itemName = $matches[1];
 				$items = $subscriptionStore->getSubscriptionItemsForUser(