diff --git a/changelog.d/tos-setting.add b/changelog.d/tos-setting.add
new file mode 100644
index 000000000..db9b0d5f2
--- /dev/null
+++ b/changelog.d/tos-setting.add
@@ -0,0 +1 @@
+Allow Terms of Service panel behaviour to be configurable
diff --git a/config/config.exs b/config/config.exs
index a231c5ba0..31d7258ee 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -307,6 +307,7 @@ config :pleroma, :frontend_configurations,
     collapseMessageWithSubject: false,
     disableChat: false,
     greentext: false,
+    embeddedToS: true,
     hideFilteredStatuses: false,
     hideMutedPosts: false,
     hidePostStats: false,
diff --git a/config/description.exs b/config/description.exs
index 2f7dc30a0..e20fa4b28 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1261,6 +1261,7 @@ config :pleroma, :config_description, [
             background: "/static/aurora_borealis.jpg",
             collapseMessageWithSubject: false,
             greentext: false,
+            embeddedToS: true,
             hideFilteredStatuses: false,
             hideMutedPosts: false,
             hidePostStats: false,
@@ -1312,6 +1313,12 @@ config :pleroma, :config_description, [
             type: :boolean,
             description: "Enables green text on lines prefixed with the > character"
           },
+          %{
+            key: :embeddedToS,
+            label: "Embedded ToS panel",
+            type: :boolean,
+            description: "Hide Terms of Service panel decorations on About and Registration pages"
+          },
           %{
             key: :hideFilteredStatuses,
             label: "Hide Filtered Statuses",