diff --git a/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
index 5375152b6..cbe950c84 100644
--- a/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
+++ b/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
@@ -120,7 +120,9 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
                     .onTapGesture { }
             }
             
-            if !context.viewState.timelineKind.isThread, let threadSummary = timelineItem.properties.threadSummary {
+            if context.viewState.areThreadsEnabled,
+               !context.viewState.timelineKind.isThread,
+               let threadSummary = timelineItem.properties.threadSummary {
                 TimelineThreadSummaryView(threadSummary: threadSummary) {
                     context.send(viewAction: .displayThread(itemID: timelineItem.id))
                 }
@@ -319,8 +321,14 @@ private extension View {
 // MARK: - Previews
 
 struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview {
-    static let viewModel = TimelineViewModel.mock
+    static let viewModel: TimelineViewModel = {
+        ServiceLocator.shared.settings.threadsEnabled = true
+        return TimelineViewModel.mock
+    }()
+    
     static let viewModelWithPins: TimelineViewModel = {
+        ServiceLocator.shared.settings.threadsEnabled = true
+        
         let roomProxy = JoinedRoomProxyMock(.init(name: "Preview Room", pinnedEventIDs: ["pinned"]))
         return TimelineViewModel(roomProxy: roomProxy,
                                  focussedEventID: nil,