diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index c03f959865..14a3c28ab9 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -531,7 +531,7 @@ class Feed {
 				if (!empty($id) && !empty($taglist)) {
 					$feeditem = Item::selectFirst(['uri-id'], ['id' => $id]);
 					foreach ($taglist as $tag) {
-						Tag::storeByHash($feeditem['uri-id'], '#', $tag);
+						Tag::store($feeditem['uri-id'], Tag::HASHTAG, $tag);
 					}					
 				}
 			}
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 7dad68550b..d95810e3a6 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -665,7 +665,7 @@ class OStatus
 						$item['tag'] .= '#[url=' . DI::baseUrl() . '/search?tag=' . $term . ']' . $term . '[/url]';
 
 						// Store the hashtag
-						Tag::storeByHash($item['uri-id'], '#', $term);
+						Tag::store($item['uri-id'], Tag::HASHTAG, $term);
 					}
 				}
 			}