diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarModels.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarModels.swift
index 235b7de83..e416695ff 100644
--- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarModels.swift
+++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarModels.swift
@@ -82,8 +82,6 @@ struct ComposerToolbarViewState: BindableState {
     
     var keyCommands: [WysiwygKeyCommand] = []
     
-    var isInThread: Bool
-    
     var bindings: ComposerToolbarViewStateBindings
 
     var isUploading: Bool {
diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift
index 2a8d23660..27e284814 100644
--- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift
+++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift
@@ -46,7 +46,6 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
 
     init(initialText: String? = nil,
          roomProxy: JoinedRoomProxyProtocol,
-         isInThread: Bool = false,
          wysiwygViewModel: WysiwygComposerViewModel,
          completionSuggestionService: CompletionSuggestionServiceProtocol,
          mediaProvider: MediaProviderProtocol,
@@ -69,7 +68,6 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
                                                               audioRecorderState: .init(),
                                                               isRoomEncrypted: roomProxy.infoPublisher.value.isEncrypted,
                                                               isLocationSharingEnabled: appSettings.mapTilerConfiguration.isEnabled,
-                                                              isInThread: isInThread,
                                                               bindings: .init()),
                    mediaProvider: mediaProvider)
         
diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/RoomAttachmentPicker.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/RoomAttachmentPicker.swift
index 2bb054735..c22be2d49 100644
--- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/RoomAttachmentPicker.swift
+++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/RoomAttachmentPicker.swift
@@ -40,14 +40,12 @@ struct RoomAttachmentPicker: View {
             }
             .accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerTextFormatting)
             
-            if !context.viewState.isInThread {
-                Button {
-                    context.send(viewAction: .attach(.poll))
-                } label: {
-                    Label(L10n.screenRoomAttachmentSourcePoll, icon: \.polls)
-                }
-                .accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerPoll)
+            Button {
+                context.send(viewAction: .attach(.poll))
+            } label: {
+                Label(L10n.screenRoomAttachmentSourcePoll, icon: \.polls)
             }
+            .accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerPoll)
             
             if context.viewState.isLocationSharingEnabled {
                 Button {
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
index 6ccd9156c..d4cf385fb 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
@@ -98,7 +98,6 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
                                                         parserStyle: .elementX)
         let composerViewModel = ComposerToolbarViewModel(initialText: parameters.sharedText,
                                                          roomProxy: parameters.roomProxy,
-                                                         isInThread: false,
                                                          wysiwygViewModel: wysiwygViewModel,
                                                          completionSuggestionService: parameters.completionSuggestionService,
                                                          mediaProvider: parameters.mediaProvider,
diff --git a/ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift b/ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift
index 7ab29a5b5..8dfc350c4 100644
--- a/ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift
+++ b/ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift
@@ -76,7 +76,6 @@ final class ThreadTimelineScreenCoordinator: CoordinatorProtocol {
         
         composerViewModel = ComposerToolbarViewModel(initialText: nil,
                                                      roomProxy: parameters.roomProxy,
-                                                     isInThread: true,
                                                      wysiwygViewModel: wysiwygViewModel,
                                                      completionSuggestionService: parameters.completionSuggestionService,
                                                      mediaProvider: parameters.mediaProvider,