diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx
index 7f23efbce2..88e8f2def3 100644
--- a/src/components/views/rooms/MessageComposerButtons.tsx
+++ b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -289,20 +289,22 @@ function voiceRecordingButton(props: IProps, narrow: boolean): ReactElement | nu
 }
 
 function pollButton(room: Room, relation?: IEventRelation): ReactElement {
-    return <PollButton key="polls" room={room} relation={relation} />;
+    return (
+        <OverflowMenuContext.Consumer key="polls">
+            {(context) => <PollButton room={room} relation={relation} context={context} />}
+        </OverflowMenuContext.Consumer>
+    );
 }
 
 interface IPollButtonProps {
     room: Room;
     relation?: IEventRelation;
+    context: React.ContextType<typeof OverflowMenuContext>;
 }
 
 class PollButton extends React.PureComponent<IPollButtonProps> {
-    public static contextType = OverflowMenuContext;
-    public context!: React.ContextType<typeof OverflowMenuContext>;
-
     private onCreateClick = (): void => {
-        this.context?.(); // close overflow menu
+        this.props.context?.(); // close overflow menu
         const canSend = this.props.room.currentState.maySendEvent(
             M_POLL_START.name,
             MatrixClientPeg.safeGet().getSafeUserId(),