diff --git a/lib/pleroma/web/api_spec/operations/mastodon_admin/report_operation.ex b/lib/pleroma/web/api_spec/operations/mastodon_admin/report_operation.ex
index 3360cb843..f59db9966 100644
--- a/lib/pleroma/web/api_spec/operations/mastodon_admin/report_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/mastodon_admin/report_operation.ex
@@ -28,6 +28,7 @@ defmodule Pleroma.Web.ApiSpec.MastodonAdmin.ReportOperation do
       parameters:
         [
           Operation.parameter(:resolved, :query, :boolean, "Filter for resolved reports"),
+          Operation.parameter(:unresolved, :query, :boolean, "Filter for open reports"),
           Operation.parameter(:account_id, :query, :string, "Filter by author account id"),
           Operation.parameter(
             :target_account_id,
diff --git a/lib/pleroma/web/mastodon_api/admin/controllers/report_controller.ex b/lib/pleroma/web/mastodon_api/admin/controllers/report_controller.ex
index 2d89d13bc..5dbf19aba 100644
--- a/lib/pleroma/web/mastodon_api/admin/controllers/report_controller.ex
+++ b/lib/pleroma/web/mastodon_api/admin/controllers/report_controller.ex
@@ -89,11 +89,46 @@ defmodule Pleroma.Web.MastodonAPI.Admin.ReportController do
     end
   end
 
+  def assign_to_self(%{assigns: %{user: admin}} = conn, %{id: id}) do
+    with {:ok, activity} <- CommonAPI.assign_report_to_account(id, admin.id),
+         report <- Activity.get_by_id_with_user_actor(activity.id) do
+      ModerationLog.insert_log(%{
+        action: "report_assigned",
+        actor: admin,
+        subject: activity,
+        subject_actor: report.user_actor,
+        assigned_account: admin.nickname
+      })
+
+      render(conn, "show.json", Report.extract_report_info(report))
+    else
+      {:error, error} ->
+        json_response(conn, :bad_request, %{error: error})
+    end
+  end
+
+  def unassign(%{assigns: %{user: admin}} = conn, %{id: id}) do
+    with {:ok, activity} <- CommonAPI.assign_report_to_account(id, nil),
+         report <- Activity.get_by_id_with_user_actor(activity.id) do
+      ModerationLog.insert_log(%{
+        action: "report_unassigned",
+        actor: admin,
+        subject: activity,
+        subject_actor: report.user_actor
+      })
+
+      render(conn, "show.json", Report.extract_report_info(report))
+    else
+      {:error, error} ->
+        json_response(conn, :bad_request, %{error: error})
+    end
+  end
+
   defp restrict_state(opts, %{resolved: true}), do: Map.put(opts, :state, "resolved")
 
-  defp restrict_state(opts, %{resolved: false}), do: Map.put(opts, :state, "open")
+  defp restrict_state(opts, %{resolved: _}), do: Map.put(opts, :state, "resolved")
 
-  defp restrict_state(opts, _params), do: opts
+  defp restrict_state(opts, _params), do: Map.put(opts, :state, "open")
 
   defp restrict_actor(opts, %{account_id: actor}) do
     with %User{ap_id: ap_id} <- User.get_by_id(actor) do
diff --git a/test/pleroma/web/mastodon_api/admin/controllers/report_controller_test.exs b/test/pleroma/web/mastodon_api/admin/controllers/report_controller_test.exs
index a0cc5f459..702dcf1db 100644
--- a/test/pleroma/web/mastodon_api/admin/controllers/report_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/admin/controllers/report_controller_test.exs
@@ -50,7 +50,17 @@ defmodule Pleroma.Web.MastodonAPI.Admin.ReportControllerTest do
 
       assert [%{"id" => ^report_id1}] =
                conn
-               |> get("/api/v1/admin/reports?resolved=false")
+               |> get("/api/v1/admin/reports?unresolved=true")
+               |> json_response_and_validate_schema(200)
+
+      assert [%{"id" => ^report_id1}] =
+               conn
+               |> get("/api/v1/admin/reports")
+               |> json_response_and_validate_schema(200)
+
+      assert [%{"id" => ^report_id2}, %{"id" => ^report_id1}] =
+               conn
+               |> get("/api/v1/admin/reports?resolved=true&unresolved=true")
                |> json_response_and_validate_schema(200)
 
       assert [%{"id" => ^report_id2}] =