diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 2762813ae..ebcf9230b 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -59,8 +59,11 @@ def render("account.json", %{user: user} = opts) do
         privacy: user_info.default_scope,
         sensitive: false
       },
+
       # Pleroma extension
-      tags: user.tags
+      pleroma: %{
+        tags: user.tags
+      }
     }
   end
 
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index f460ddd80..b3459af9a 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -78,8 +78,11 @@ def render("user.json", %{user: user = %User{}} = assigns) do
       "default_scope" => user.info.default_scope,
       "no_rich_text" => user.info.no_rich_text,
       "fields" => fields,
+
       # Pleroma extension
-      "tags" => user.tags
+      "pleroma" => %{
+        "tags" => user.tags
+      }
     }
 
     if assigns[:token] do
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
index d6c9f58c8..3cb9b9c5b 100644
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@@ -55,7 +55,7 @@ test "Represent a user account" do
         privacy: "public",
         sensitive: false
       },
-      tags: []
+      pleroma: %{tags: []}
     }
 
     assert expected == AccountView.render("account.json", %{user: user})
@@ -93,7 +93,7 @@ test "Represent a Service(bot) account" do
         privacy: "public",
         sensitive: false
       },
-      tags: []
+      pleroma: %{tags: []}
     }
 
     assert expected == AccountView.render("account.json", %{user: user})
diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs
index 0bd06f256..9898c217d 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -97,7 +97,7 @@ test "A user" do
       "default_scope" => "public",
       "no_rich_text" => false,
       "fields" => [],
-      "tags" => []
+      "pleroma" => %{"tags" => []}
     }
 
     assert represented == UserView.render("show.json", %{user: user})
@@ -139,7 +139,7 @@ test "A user for a given other follower", %{user: user} do
       "default_scope" => "public",
       "no_rich_text" => false,
       "fields" => [],
-      "tags" => []
+      "pleroma" => %{"tags" => []}
     }
 
     assert represented == UserView.render("show.json", %{user: user, for: follower})
@@ -182,7 +182,7 @@ test "A user that follows you", %{user: user} do
       "default_scope" => "public",
       "no_rich_text" => false,
       "fields" => [],
-      "tags" => []
+      "pleroma" => %{"tags" => []}
     }
 
     assert represented == UserView.render("show.json", %{user: follower, for: user})
@@ -232,7 +232,7 @@ test "A blocked user for the blocker" do
       "default_scope" => "public",
       "no_rich_text" => false,
       "fields" => [],
-      "tags" => []
+      "pleroma" => %{"tags" => []}
     }
 
     blocker = Repo.get(User, blocker.id)