diff --git a/src/Model/Item.php b/src/Model/Item.php
index e54d5fb098..524c4facb4 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -196,6 +196,10 @@ class Item
 			$previous = Post::selectFirst(['edited'], $condition);
 		}
 
+		if (!empty($fields['body'])) {
+			$fields['body'] = self::setHashtags($fields['body']);
+		}
+
 		$rows = Post::update($fields, $condition);
 		if (is_bool($rows)) {
 			return $rows;