diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx
index f7d6ceaa5f..49fb50814c 100644
--- a/src/components/structures/MessagePanel.tsx
+++ b/src/components/structures/MessagePanel.tsx
@@ -267,7 +267,9 @@ export default class MessagePanel extends React.Component<IProps, IState> {
     componentDidMount() {
         this.calculateRoomMembersCount();
         this.props.room?.on("RoomState.members", this.calculateRoomMembersCount);
-        this.props.room?.getThreads().forEach(thread => thread.fetchReplyChain());
+        if (SettingsStore.getValue("experimentalThreadSupport")) {
+            this.props.room?.getThreads().forEach(thread => thread.fetchReplyChain());
+        }
         this.isMounted = true;
     }
 
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 25f3dc740f..29212449d1 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -36,6 +36,7 @@ import Resend from "../../../Resend";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { MediaEventHelper } from "../../../utils/MediaEventHelper";
 import DownloadActionButton from "./DownloadActionButton";
+import SettingsStore from '../../../settings/SettingsStore';
 
 const OptionsButton = ({ mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange }) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
@@ -274,12 +275,14 @@ export default class MessageActionBar extends React.PureComponent {
                             onClick={this.onReplyClick}
                             key="reply"
                         />
-                        <RovingAccessibleTooltipButton
-                            className="mx_MessageActionBar_maskButton mx_MessageActionBar_threadButton"
-                            title={_t("Thread")}
-                            onClick={this.onThreadClick}
-                            key="thread"
-                        />
+                        { SettingsStore.getValue("experimentalThreadSupport") && (
+                            <RovingAccessibleTooltipButton
+                                className="mx_MessageActionBar_maskButton mx_MessageActionBar_threadButton"
+                                title={_t("Thread")}
+                                onClick={this.onThreadClick}
+                                key="thread"
+                            />
+                        )}
                     </>);
                 }
                 if (this.context.canReact) {
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index a09fabc06d..1f068439a9 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -280,9 +280,11 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
             <Button className="mx_RoomSummaryCard_icon_files" onClick={onRoomFilesClick}>
                 { _t("Show files") }
             </Button>
-            <Button className="mx_RoomSummaryCard_icon_threads" onClick={onRoomThreadsClick}>
-                { _t("Show threads") }
-            </Button>
+            { SettingsStore.getValue("experimentalThreadSupport") && (
+                <Button className="mx_RoomSummaryCard_icon_threads" onClick={onRoomThreadsClick}>
+                    { _t("Show threads") }
+                </Button>
+            ) }
             <Button className="mx_RoomSummaryCard_icon_share" onClick={onShareRoomClick}>
                 { _t("Share room") }
             </Button>
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 6f807f66d6..74d9fc5ca6 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -57,6 +57,7 @@ import ReactionsRow from '../messages/ReactionsRow';
 import { getEventDisplayInfo } from '../../../utils/EventUtils';
 import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
 import { Thread } from '../../../../../matrix-js-sdk/src/models/thread';
+import SettingsStore from "../../../settings/SettingsStore";
 
 const eventTileTypes = {
     [EventType.RoomMessage]: 'messages.MessageEvent',
@@ -461,8 +462,10 @@ export default class EventTile extends React.Component<IProps, IState> {
             this.isListeningForReceipts = true;
         }
 
-        this.props.mxEvent.once("Thread.ready", this.updateThread);
-        this.props.mxEvent.on("Thread.update", this.updateThread);
+        if (SettingsStore.getValue("experimentalThreadSupport")) {
+            this.props.mxEvent.once("Thread.ready", this.updateThread);
+            this.props.mxEvent.on("Thread.update", this.updateThread);
+        }
     }
 
     private updateThread = (thread) => {
@@ -511,6 +514,10 @@ export default class EventTile extends React.Component<IProps, IState> {
     }
 
     private renderThreadInfo(): React.ReactNode {
+        if (!SettingsStore.getValue("experimentalThreadSupport")) {
+            return null;
+        }
+
         const thread = this.state.thread;
         const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
         if (!thread || this.props.showThreadInfo === false) {