diff --git a/lib/pleroma/plugs/static_fe_plug.ex b/lib/pleroma/plugs/static_fe_plug.ex
index dcbabc9df..2af45e52a 100644
--- a/lib/pleroma/plugs/static_fe_plug.ex
+++ b/lib/pleroma/plugs/static_fe_plug.ex
@@ -3,17 +3,24 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.StaticFEPlug do
+  import Plug.Conn
+  alias Pleroma.Web.StaticFE.StaticFEController
+
   def init(options), do: options
 
-  def accepts_html?({"accept", a}), do: String.contains?(a, "text/html")
-  def accepts_html?({_, _}), do: false
-
   def call(conn, _) do
-    with true <- Pleroma.Config.get([:instance, :static_fe], false),
-         {_, _} <- Enum.find(conn.req_headers, &accepts_html?/1) do
-      Pleroma.Web.StaticFE.StaticFEController.call(conn, :show)
+    if enabled?() and accepts_html?(conn) do
+      conn
+      |> StaticFEController.call(:show)
+      |> halt()
     else
-      _ -> conn
+      conn
     end
   end
+
+  defp enabled?, do: Pleroma.Config.get([:instance, :static_fe], false)
+
+  defp accepts_html?(conn) do
+    conn |> get_req_header("accept") |> List.first() |> String.contains?("text/html")
+  end
 end
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index 96e30f317..a00c6db4f 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -58,28 +58,24 @@ def represent(%Activity{object: %Object{data: data}} = activity, selected) do
   end
 
   def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
-    instance_name = Pleroma.Config.get([:instance, :name], "Pleroma")
     activity = Activity.get_by_id_with_object(notice_id)
-    context = activity.object.data["context"]
-    activities = ActivityPub.fetch_activities_for_context(context, %{})
-
     timeline =
-      for a <- Enum.reverse(activities) do
-        represent(a, a.object.id == activity.object.id)
-      end
+      activity.object.data["context"]
+      |> ActivityPub.fetch_activities_for_context(%{})
+      |> Enum.reverse()
+      |> Enum.map(&represent(&1, &1.object.id == activity.object.id))
 
-    render(conn, "conversation.html", %{activities: timeline, instance_name: instance_name})
+    render(conn, "conversation.html", %{activities: timeline})
   end
 
   def show(%{assigns: %{username_or_id: username_or_id}} = conn, _params) do
-    instance_name = Pleroma.Config.get([:instance, :name], "Pleroma")
     %User{} = user = User.get_cached_by_nickname_or_id(username_or_id)
 
     timeline =
       ActivityPub.fetch_user_activities(user, nil, %{})
       |> Enum.map(&represent/1)
 
-    render(conn, "profile.html", %{user: user, timeline: timeline, instance_name: instance_name})
+    render(conn, "profile.html", %{user: user, timeline: timeline})
   end
 
   def assign_id(%{path_info: ["notice", notice_id]} = conn, _opts),
diff --git a/lib/pleroma/web/static_fe/static_fe_view.ex b/lib/pleroma/web/static_fe/static_fe_view.ex
index 160261af9..5612a06bb 100644
--- a/lib/pleroma/web/static_fe/static_fe_view.ex
+++ b/lib/pleroma/web/static_fe/static_fe_view.ex
@@ -36,4 +36,6 @@ def format_date(date) do
     {:ok, date, _} = DateTime.from_iso8601(date)
     Strftime.strftime!(date, "%Y/%m/%d %l:%M:%S %p UTC")
   end
+
+  def instance_name, do: Pleroma.Config.get([:instance, :name], "Pleroma")
 end
diff --git a/lib/pleroma/web/templates/layout/static_fe.html.eex b/lib/pleroma/web/templates/layout/static_fe.html.eex
index 62b59f17c..4b889bb19 100644
--- a/lib/pleroma/web/templates/layout/static_fe.html.eex
+++ b/lib/pleroma/web/templates/layout/static_fe.html.eex
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
     <title>
-    <%= Application.get_env(:pleroma, :instance)[:name] %>
+    <%= Pleroma.Config.get([:instance, :name]) %>
     </title>
     <link rel="stylesheet" href="/static/static-fe.css">
   </head>
diff --git a/lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex b/lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex
index 7ac4a9e5f..2acd84828 100644
--- a/lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex
@@ -1,5 +1,5 @@
 <header>
-  <h1><%= link @instance_name, to: "/" %></h1>
+  <h1><%= link instance_name(), to: "/" %></h1>
 </header>
 
 <main>
diff --git a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
index 9b3d0509e..fa3df3b4e 100644
--- a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
@@ -1,5 +1,5 @@
 <header>
-  <h1><%= link @instance_name, to: "/" %></h1>
+  <h1><%= link instance_name(), to: "/" %></h1>
 
   <h3>
     <form class="pull-right collapse" method="POST" action="<%= Helpers.util_path(@conn, :remote_subscribe) %>">