diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 2d3487f6a3e8c4d6c9b342595e63952ff7a9ddd3..4afc73bf497455ff02e09cf88077866e58e93ca8 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -189,7 +189,7 @@ def add_hashtag_links({subs, text}, tags) do
     end)
 
     subs = subs ++ Enum.map(tags, fn ({_, tag, uuid}) ->
-      url = "#<a href='#{Pleroma.Web.base_url}/tag/#{tag}' rel='tag'>#{tag}</a>"
+      url = "<a href='#{Pleroma.Web.base_url}/tag/#{tag}' rel='tag'>##{tag}</a>"
       {uuid, url}
     end)
 
diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index 0e915d8d55aa836eebaf67f17ba1b5b32285e696..9ec2cc9f2ebe289e825c14ffe646e70befee8376 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -7,7 +7,7 @@ defmodule Pleroma.FormatterTest do
   describe ".add_hashtag_links" do
     test "turns hashtags into links" do
       text = "I love #cofe and #2hu"
-      expected_text = "I love #<a href='http://localhost:4001/tag/cofe' rel='tag'>cofe</a> and #<a href='http://localhost:4001/tag/2hu' rel='tag'>2hu</a>"
+      expected_text = "I love <a href='http://localhost:4001/tag/cofe' rel='tag'>#cofe</a> and <a href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a>"
 
       tags = Formatter.parse_tags(text)
       assert expected_text == Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 7d578a751deda8b996a8d2284247f794756395f8..715a746ef7805bc26a82f62653670bfb8d639cbb 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -34,7 +34,7 @@ test "create a status" do
 
     { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
 
-    expected_text = "Hello again, <span><a href='shp'>@<span>shp</span></a></span>.&lt;script&gt;&lt;/script&gt;<br>This is on another :moominmamma: line. #<a href='http://localhost:4001/tag/2hu' rel='tag'>2hu</a> #<a href='http://localhost:4001/tag/epic' rel='tag'>epic</a> #<a href='http://localhost:4001/tag/phantasmagoric' rel='tag'>phantasmagoric</a><br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>"
+    expected_text = "Hello again, <span><a href='shp'>@<span>shp</span></a></span>.&lt;script&gt;&lt;/script&gt;<br>This is on another :moominmamma: line. <a href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a> <a href='http://localhost:4001/tag/epic' rel='tag'>#epic</a> <a href='http://localhost:4001/tag/phantasmagoric' rel='tag'>#phantasmagoric</a><br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>"
     assert get_in(activity.data, ["object", "content"]) == expected_text
     assert get_in(activity.data, ["object", "type"]) == "Note"
     assert get_in(activity.data, ["object", "actor"]) == user.ap_id