diff --git a/lib/pleroma/web/admin_api/controllers/webhook_controller.ex b/lib/pleroma/web/admin_api/controllers/webhook_controller.ex
index cc606916e..4d064e0b5 100644
--- a/lib/pleroma/web/admin_api/controllers/webhook_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/webhook_controller.ex
@@ -40,14 +40,14 @@ defmodule Pleroma.Web.AdminAPI.WebhookController do
   end
 
   def create(%{body_params: params} = conn, _) do
-    with {:ok, webhook} <- Webhook.create(params) do
+    with {:ok, webhook} <- Webhook.create(webhook_params(params)) do
       render(conn, "show.json", webhook: webhook)
     end
   end
 
   def update(%{body_params: params} = conn, %{id: id}) do
     with %Webhook{internal: false} = webhook <- Webhook.get(id),
-         {:ok, webhook} <- Webhook.update(webhook, params) do
+         {:ok, webhook} <- Webhook.update(webhook, webhook_params(params)) do
       render(conn, "show.json", webhook: webhook)
     else
       %Webhook{internal: true} -> {:error, :forbidden}
@@ -94,4 +94,8 @@ defmodule Pleroma.Web.AdminAPI.WebhookController do
       nil -> {:error, :not_found}
     end
   end
+
+  defp webhook_params(params) do
+    Map.drop(params, [:internal, "internal"])
+  end
 end
diff --git a/lib/pleroma/web/api_spec/operations/admin/webhook_operation.ex b/lib/pleroma/web/api_spec/operations/admin/webhook_operation.ex
index 5bce837f7..2b538ca8b 100644
--- a/lib/pleroma/web/api_spec/operations/admin/webhook_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/admin/webhook_operation.ex
@@ -58,9 +58,10 @@ defmodule Pleroma.Web.ApiSpec.Admin.WebhookOperation do
             required: [:url, :events],
             properties: %{
               url: %Schema{type: :string, format: :uri},
-              events: event_type(),
+              events: event_type(min_items: 1),
               enabled: %Schema{type: :boolean}
-            }
+            },
+            additionalProperties: false
           }
         ),
       responses: %{
@@ -84,9 +85,10 @@ defmodule Pleroma.Web.ApiSpec.Admin.WebhookOperation do
             type: :object,
             properties: %{
               url: %Schema{type: :string, format: :uri},
-              events: event_type(),
+              events: event_type(min_items: 1),
               enabled: %Schema{type: :boolean}
-            }
+            },
+            additionalProperties: false
           }
         ),
       responses: %{
@@ -180,8 +182,8 @@ defmodule Pleroma.Web.ApiSpec.Admin.WebhookOperation do
     }
   end
 
-  defp event_type do
-    %Schema{
+  defp event_type(opts \\ []) do
+    schema = %Schema{
       type: :array,
       items: %Schema{
         title: "Event",
@@ -190,6 +192,11 @@ defmodule Pleroma.Web.ApiSpec.Admin.WebhookOperation do
         enum: ["account.created", "report.created"]
       }
     }
+
+    case Keyword.fetch(opts, :min_items) do
+      {:ok, min_items} -> %{schema | minItems: min_items}
+      :error -> schema
+    end
   end
 
   defp id_param do
diff --git a/test/pleroma/web/admin_api/controllers/webhook_controller_test.exs b/test/pleroma/web/admin_api/controllers/webhook_controller_test.exs
index 78edbf05a..800d6367e 100644
--- a/test/pleroma/web/admin_api/controllers/webhook_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/webhook_controller_test.exs
@@ -61,6 +61,27 @@ defmodule Pleroma.Web.AdminAPI.WebhookControllerTest do
 
       assert %{url: "http://example.com/webhook", events: [:"account.created"]} = Webhook.get(id)
     end
+
+    test "rejects empty events", %{conn: conn} do
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> post("/api/pleroma/admin/webhooks", %{
+        url: "http://example.com/webhook",
+        events: []
+      })
+      |> json_response(:bad_request)
+    end
+
+    test "rejects internal flag", %{conn: conn} do
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> post("/api/pleroma/admin/webhooks", %{
+        url: "http://example.com/webhook",
+        events: ["account.created"],
+        internal: true
+      })
+      |> json_response(:bad_request)
+    end
   end
 
   describe "PATCH /api/pleroma/admin/webhooks" do
@@ -78,6 +99,30 @@ defmodule Pleroma.Web.AdminAPI.WebhookControllerTest do
       assert %{events: [:"report.created", :"account.created"]} = Webhook.get(id)
     end
 
+    test "rejects empty events", %{conn: conn} do
+      {:ok, %{id: id}} =
+        Webhook.create(%{url: "https://example.com/webhook1", events: [:"report.created"]})
+
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> patch("/api/pleroma/admin/webhooks/#{id}", %{events: []})
+      |> json_response(:bad_request)
+
+      assert %{events: [:"report.created"]} = Webhook.get(id)
+    end
+
+    test "rejects internal flag", %{conn: conn} do
+      {:ok, %{id: id}} =
+        Webhook.create(%{url: "https://example.com/webhook1", events: [:"report.created"]})
+
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> patch("/api/pleroma/admin/webhooks/#{id}", %{internal: true})
+      |> json_response(:bad_request)
+
+      assert %{internal: false} = Webhook.get(id)
+    end
+
     test "can't edit an internal webhook", %{conn: conn} do
       {:ok, %{id: id}} =
         Webhook.create(%{url: "https://example.com/webhook1", events: [], internal: true})