diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx
index 0dbeacc719..a66422bbab 100644
--- a/src/components/views/rooms/MessageComposerButtons.tsx
+++ b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -337,6 +337,9 @@ class PollButton extends React.PureComponent<IPollButtonProps> {
     };
 
     render() {
+        // do not allow sending polls within threads at this time
+        if (this.props.relation?.rel_type === RelationType.Thread) return null;
+
         return (
             <CollapsibleButton
                 className="mx_MessageComposer_button mx_MessageComposer_poll"