diff --git a/src/Model/Item.php b/src/Model/Item.php
index 5427ff44b3..ebee91ffc2 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2621,7 +2621,7 @@ class Item extends BaseObject
 				"#$2", $item["body"]);
 
 		foreach ($tags as $tag) {
-			if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=') || $tag[1] == '#') {
+			if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=') || strlen($tag) < 2 || $tag[1] == '#') {
 				continue;
 			}