diff --git a/lib/graphql/resolvers/feed_token.ex b/lib/graphql/resolvers/feed_token.ex
index 196da066c..9db31b38e 100644
--- a/lib/graphql/resolvers/feed_token.ex
+++ b/lib/graphql/resolvers/feed_token.ex
@@ -2,6 +2,8 @@ defmodule Mobilizon.GraphQL.Resolvers.FeedToken do
   @moduledoc """
   Handles the feed tokens-related GraphQL calls.
   """
+  import Ecto.Query
+  alias Mobilizon.Storage.Repo
 
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Events
@@ -41,6 +43,40 @@ defmodule Mobilizon.GraphQL.Resolvers.FeedToken do
     {:error, dgettext("errors", "You are not allowed to create a feed token if not connected")}
   end
 
+  @doc """
+  Retrieve a feed token for actor, if actor belongs to logged user
+  """
+  @spec actor_tokens(any, map, map) :: {:ok, map} | {:error, String.t()}
+  def actor_tokens(
+        %Actor{id: actor_id},
+        _args,
+        %{context: %{current_user: %User{} = user}}
+      ) do
+    case User.owns_actor(user, actor_id) do
+      {:is_owned, %Actor{}} ->
+        res =
+          actor_id
+          |> feed_token_for_actor_query()
+          |> Repo.all()
+          |> Enum.map(&to_short_uuid/1)
+
+        {:ok, res}
+
+      {:is_owned, _} ->
+        {:error, dgettext("errors", "You don't have permission to get this token")}
+    end
+  end
+
+  @spec actor_tokens(any, map, map) :: {:error, String.t()}
+  def actor_tokens(_parent, _args, %{}) do
+    {:error, dgettext("errors", "You are not allowed to get a feed token if not connected")}
+  end
+
+  @spec feed_token_for_actor_query(integer) :: Ecto.Query.t()
+  defp feed_token_for_actor_query(actor_id) do
+    from(tk in FeedToken, where: tk.actor_id == ^actor_id, preload: [:actor, :user])
+  end
+
   @doc """
   Delete a feed token
   """
diff --git a/lib/graphql/schema/actors/person.ex b/lib/graphql/schema/actors/person.ex
index 126921ea2..8ef0178b3 100644
--- a/lib/graphql/schema/actors/person.ex
+++ b/lib/graphql/schema/actors/person.ex
@@ -4,10 +4,7 @@ defmodule Mobilizon.GraphQL.Schema.Actors.PersonType do
   """
   use Absinthe.Schema.Notation
 
-  import Absinthe.Resolution.Helpers, only: [dataloader: 2]
-
-  alias Mobilizon.Events
-  alias Mobilizon.GraphQL.Resolvers.{Conversation, Media, Person}
+  alias Mobilizon.GraphQL.Resolvers.{Conversation, FeedToken, Media, Person}
   alias Mobilizon.GraphQL.Schema
 
   import_types(Schema.Events.FeedTokenType)
@@ -64,13 +61,7 @@ defmodule Mobilizon.GraphQL.Schema.Actors.PersonType do
     )
 
     field(:feed_tokens, list_of(:feed_token),
-      resolve:
-        dataloader(
-          Events,
-          callback: fn feed_tokens, _parent, _args ->
-            {:ok, Enum.map(feed_tokens, &Map.put(&1, :token, ShortUUID.encode!(&1.token)))}
-          end
-        ),
+      resolve: &FeedToken.actor_tokens/3,
       description: "A list of the feed tokens for this person"
     )
 
diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex
index f741354c3..c965bc238 100644
--- a/lib/mobilizon/events/events.ex
+++ b/lib/mobilizon/events/events.ex
@@ -1280,26 +1280,6 @@ defmodule Mobilizon.Events do
   @spec delete_feed_token(FeedToken.t()) :: {:ok, FeedToken.t()} | {:error, Changeset.t()}
   def delete_feed_token(%FeedToken{} = feed_token), do: Repo.delete(feed_token)
 
-  @doc """
-  Returns the list of feed tokens for an user.
-  """
-  @spec list_feed_tokens_for_user(User.t()) :: [FeedTokens.t()]
-  def list_feed_tokens_for_user(%User{id: user_id}) do
-    user_id
-    |> feed_token_for_user_query()
-    |> Repo.all()
-  end
-
-  @doc """
-  Returns the list of feed tokens for an actor.
-  """
-  @spec list_feed_tokens_for_actor(Actor.t()) :: [FeedTokens.t()]
-  def list_feed_tokens_for_actor(%Actor{id: actor_id, domain: nil}) do
-    actor_id
-    |> feed_token_for_actor_query()
-    |> Repo.all()
-  end
-
   @spec event_by_url_query(String.t()) :: Ecto.Query.t()
   defp event_by_url_query(url) do
     from(e in Event, where: e.url == ^url)
@@ -1910,16 +1890,6 @@ defmodule Mobilizon.Events do
     from(ftk in FeedToken, where: ftk.token == ^token, preload: [:actor, :user])
   end
 
-  @spec feed_token_for_user_query(integer) :: Ecto.Query.t()
-  defp feed_token_for_user_query(user_id) do
-    from(tk in FeedToken, where: tk.user_id == ^user_id, preload: [:actor, :user])
-  end
-
-  @spec feed_token_for_actor_query(integer) :: Ecto.Query.t()
-  defp feed_token_for_actor_query(actor_id) do
-    from(tk in FeedToken, where: tk.actor_id == ^actor_id, preload: [:actor, :user])
-  end
-
   @spec filter_public_visibility(Ecto.Queryable.t()) :: Ecto.Query.t()
   defp filter_public_visibility(query) do
     from(e in query, where: e.visibility == ^:public)
diff --git a/src/views/Account/children/EditIdentity.vue b/src/views/Account/children/EditIdentity.vue
index d14fb7d25..13daa4e12 100644
--- a/src/views/Account/children/EditIdentity.vue
+++ b/src/views/Account/children/EditIdentity.vue
@@ -507,14 +507,14 @@ const copyURL = (e: Event, url: string, format: "ics" | "atom"): void => {
 };
 
 const generateFeedTokens = async (): Promise<void> => {
-  await createNewFeedToken({ actorId: identity.value?.id });
+  await createNewFeedToken({ actor_id: identity.value?.id });
 };
 
 const regenerateFeedTokens = async (): Promise<void> => {
   if (identity.value?.feedTokens.length < 1) return;
   await deleteFeedToken({ token: identity.value.feedTokens[0].token });
   await createNewFeedToken(
-    { actorId: identity.value?.id },
+    { actor_id: identity.value?.id },
     {
       update(cache, { data }) {
         const actorId = data?.createFeedToken.actor?.id;