diff --git a/src/neochatconfig.kcfg b/src/neochatconfig.kcfg
index ee592333f..90fbea857 100644
--- a/src/neochatconfig.kcfg
+++ b/src/neochatconfig.kcfg
@@ -156,5 +156,11 @@
       <default></default>
     </entry>
   </group>
+  <group name="FeatureFlags">
+    <entry name="Threads" type="bool">
+      <label>Enable threads</label>
+      <default>false</default>
+    </entry>
+  </group>
 </kcfg>
 
diff --git a/src/qml/HoverActions.qml b/src/qml/HoverActions.qml
index e6c3d7269..d66b1a44c 100644
--- a/src/qml/HoverActions.qml
+++ b/src/qml/HoverActions.qml
@@ -7,6 +7,7 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
+import org.kde.neochat.config
 
 /**
  * @brief A component that provides a set of actions when a message is hovered in the timeline.
@@ -108,7 +109,7 @@ QQC2.Control {
                     }
                 },
                 Kirigami.Action {
-                    visible: !root.currentRoom.readOnly
+                    visible: Config.threads && !root.currentRoom.readOnly
                     text: i18n("Reply in Thread")
                     icon.name: "dialog-messages"
                     onTriggered: {