diff --git a/test/pleroma/web/plugs/ensure_host_matches_plug_test.exs b/test/pleroma/web/plugs/ensure_host_matches_plug_test.exs
index fbebc21d9..67252e7a7 100644
--- a/test/pleroma/web/plugs/ensure_host_matches_plug_test.exs
+++ b/test/pleroma/web/plugs/ensure_host_matches_plug_test.exs
@@ -55,6 +55,19 @@ defmodule Pleroma.Web.Plugs.EnsureHostMatchesPlugTest do
       assert conn.resp_body == "Host header does not match this instance"
     end
 
+    test "it rejects Host header not matching Endpoint with port", %{conn: conn} do
+      endpoint = URI.parse(Endpoint.url())
+
+      conn =
+        conn
+        |> set_host("invalid.example.com:#{endpoint.port}")
+        |> EnsureHostMatchesPlug.call(%{})
+
+      assert conn.status == 400
+      assert conn.halted == true
+      assert conn.resp_body == "Host header does not match this instance"
+    end
+
     test "it rejects Host header not matching Endpoint port", %{conn: conn} do
       endpoint = URI.parse(Endpoint.url())
 
@@ -80,6 +93,18 @@ defmodule Pleroma.Web.Plugs.EnsureHostMatchesPlugTest do
       assert conn.resp_body == "More than one Host header provided"
     end
 
+    test "it works for Host header without port", %{conn: conn} do
+      endpoint = URI.parse(Endpoint.url())
+
+      conn =
+        conn
+        |> set_host("#{endpoint.host}")
+        |> EnsureHostMatchesPlug.call(%{})
+
+      assert conn.halted == false
+      assert Map.get(conn.assigns, :valid_host_header, nil)
+    end
+
     test "it works for Host header with port as 80", %{conn: conn} do
       endpoint = URI.parse(Endpoint.url())