diff --git a/config/config.exs b/config/config.exs
index e8ae31542..2b2583671 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -185,6 +185,7 @@ config :pleroma, :instance,
   short_description: "",
   background_image: "/images/city.jpg",
   instance_thumbnail: "/instance/thumbnail.jpeg",
+  favicon: "/favicon.png",
   limit: 5_000,
   description_limit: 5_000,
   remote_limit: 100_000,
diff --git a/config/description.exs b/config/description.exs
index d18649ae8..86756586f 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -987,6 +987,13 @@ config :pleroma, :config_description, [
           "The instance thumbnail can be any image that represents your instance and is used by some apps or services when they display information about your instance.",
         suggestions: ["/instance/thumbnail.jpeg"]
       },
+      %{
+        key: :favicon,
+        type: {:string, :image},
+        description:
+          "Favicon of the instance",
+        suggestions: ["/favicon.png"]
+      },
       %{
         key: :show_reactions,
         type: :boolean,
diff --git a/lib/pleroma/web/fallback/redirect_controller.ex b/lib/pleroma/web/fallback/redirect_controller.ex
index 1a86f7a53..9e1bbfb49 100644
--- a/lib/pleroma/web/fallback/redirect_controller.ex
+++ b/lib/pleroma/web/fallback/redirect_controller.ex
@@ -38,10 +38,11 @@ defmodule Pleroma.Web.Fallback.RedirectController do
     tags = build_tags(conn, params)
     preloads = preload_data(conn, params)
     title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
+    favicon = "<link rel='icon' href='#{Pleroma.Config.get([:instance, :favicon])}'>"
 
     response =
       index_content
-      |> String.replace("<!--server-generated-meta-->", tags <> preloads <> title)
+      |> String.replace("<!--server-generated-meta-->", tags <> preloads <> title <> favicon)
 
     conn
     |> put_resp_content_type("text/html")
@@ -56,10 +57,11 @@ defmodule Pleroma.Web.Fallback.RedirectController do
     {:ok, index_content} = File.read(index_file_path())
     preloads = preload_data(conn, params)
     title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
+    favicon = "<link rel='icon' href='#{Pleroma.Config.get([:instance, :favicon])}'>"
 
     response =
       index_content
-      |> String.replace("<!--server-generated-meta-->", preloads <> title)
+      |> String.replace("<!--server-generated-meta-->", preloads <> title <> favicon)
 
     conn
     |> put_resp_content_type("text/html")