diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 607a0144c..d4bc8f63d 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -14,6 +14,8 @@ def start(_type, _args) do
         # Start the Ecto repository
         supervisor(Pleroma.Repo, []),
         worker(Pleroma.Emoji, []),
+        # Start the endpoint when the application starts
+        supervisor(Pleroma.Web.Endpoint, []),
         # Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3)
         # worker(Pleroma.Worker, [arg1, arg2, arg3]),
         worker(
@@ -57,8 +59,6 @@ def start(_type, _args) do
         ),
         worker(Pleroma.Web.Federator, []),
         worker(Pleroma.Stats, []),
-        # Start the endpoint when the application starts
-        supervisor(Pleroma.Web.Endpoint, []),
         worker(Pleroma.Gopher.Server, [])
       ] ++
         if Mix.env() == :test,