diff --git a/changelog.d/local-nickname-regex.fix b/changelog.d/local-nickname-regex.fix
new file mode 100644
index 000000000..81ddd9cff
--- /dev/null
+++ b/changelog.d/local-nickname-regex.fix
@@ -0,0 +1 @@
+Use end-of-string in regex for local `get_by_nickname`
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 84551afd5..21ac31f33 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1364,7 +1364,7 @@ defmodule Pleroma.User do
   @spec get_by_nickname(String.t()) :: User.t() | nil
   def get_by_nickname(nickname) do
     Repo.get_by(User, nickname: nickname) ||
-      if Regex.match?(~r(@#{Pleroma.Web.Endpoint.host()})i, nickname) do
+      if Regex.match?(~r(@#{Pleroma.Web.Endpoint.host()}$)i, nickname) do
         Repo.get_by(User, nickname: local_nickname(nickname))
       end
   end