diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index d2d416655..97d822477 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -258,6 +258,35 @@ def run(["untag", nickname | tags]) do
     end
   end
 
+  def run(["broadcast_public_keys" | _rest]) do
+    start_pleroma()
+
+    Pleroma.User.Query.build(%{
+      local: true,
+      is_active: true
+    })
+    |> Pleroma.Repo.chunk_stream(50, :batches)
+    |> Stream.each(fn users ->
+      users
+      |> Enum.each(fn user ->
+        IO.puts("Broadcasting: #{user.ap_id}")
+        changeset = User.update_changeset(user, %{ keys: user.keys })
+        {:ok, unpersisted_user} = Ecto.Changeset.apply_action(changeset, :update)
+        updated_object =
+          Pleroma.Web.ActivityPub.UserView.render("user.json", user: unpersisted_user)
+          |> Map.delete("@context")
+
+        {:ok, update_data, []} = Builder.update(user, updated_object)
+        {:ok, _update, _} =
+          Pipeline.common_pipeline(update_data,
+            local: true,
+            user_update_changeset: changeset
+          )
+      end)
+    end)
+    |> Stream.run()
+  end
+
   def run(["invite" | rest]) do
     {options, [], []} =
       OptionParser.parse(rest,