diff --git a/cypress/e2e/polls/polls.spec.ts b/cypress/e2e/polls/polls.spec.ts
index 00b944ce9d9..c69753d6e5c 100644
--- a/cypress/e2e/polls/polls.spec.ts
+++ b/cypress/e2e/polls/polls.spec.ts
@@ -30,8 +30,10 @@ describe("Polls", () => {
     type CreatePollOptions = {
         title: string;
         options: string[];
+        multiSelect?: boolean;
+        maxSelections?: string;
     };
-    const createPoll = ({ title, options }: CreatePollOptions) => {
+    const createPoll = ({ title, options, multiSelect = false, maxSelections }: CreatePollOptions) => {
         if (options.length < 2) {
             throw new Error('Poll must have at least two options');
         }
@@ -47,6 +49,20 @@ describe("Polls", () => {
                 }
                 cy.get(optionId).scrollIntoView().type(option);
             });
+
+            if (multiSelect) {
+                if (!maxSelections) {
+                    cy.get('#mx_Field_2')
+                        .find('option')
+                        .its('length')
+                        .then((length) => {
+                            // select last option
+                            cy.get('#mx_Field_2').select(length - 1);
+                        });
+                } else {
+                    cy.get('#mx_Field_2').select(maxSelections);
+                }
+            }
         });
         cy.get('.mx_Dialog button[type="submit"]').click();
     };
@@ -65,10 +81,33 @@ describe("Polls", () => {
         });
     };
 
-    const botVoteForOption = (bot: MatrixClient, roomId: string, pollId: string, optionText: string): void => {
+    const bots = [];
+    const botVotes = [];
+
+    const botMultiVote = (bot: MatrixClient, optionId: string): void => {
+        // populate botVotes with array(s) for each individual bot holding their answer(s)
+        // allows for testing multiple bot votes
+        if (!bots.includes(bot.credentials)) {
+            bots.push(bot.credentials);
+            botVotes.push([]);
+        }
+        if (!botVotes[bots.indexOf(bot.credentials)].includes(optionId)) {
+            botVotes[bots.indexOf(bot.credentials)].push(optionId);
+        }
+    };
+
+    const botVoteForOption = (bot: MatrixClient, roomId: string, pollId: string, optionText: string,
+        type = "radio"): void => {
         getPollOption(pollId, optionText).within(ref => {
-            cy.get('input[type="radio"]').invoke('attr', 'value').then(optionId => {
-                const pollVote = PollResponseEvent.from([optionId], pollId).serialize();
+            cy.get(`input[type=${type}]`).invoke('attr', 'value').then(optionId => {
+                let answer = [];
+                if (type === "radio") {
+                    answer = [optionId];
+                } else if (!botVotes.includes(optionId)) {
+                    botMultiVote(bot, optionId);
+                    answer = botVotes[bots.indexOf(bot.credentials)];
+                }
+                const pollVote = PollResponseEvent.from(answer, pollId).serialize();
                 bot.sendEvent(
                     roomId,
                     pollVote.type,
@@ -338,4 +377,175 @@ describe("Polls", () => {
             });
         });
     });
+
+    describe("Multiple choice polls", () => {
+        beforeEach(() => {
+            botVotes.length = 0;
+            bots.length = 0;
+        });
+
+        it("should be creatable and allow voting for multiple options", () => {
+            let botBob: MatrixClient;
+            let botCharlie: MatrixClient;
+            cy.getBot(synapse, { displayName: "BotBob" }).then(_bot => {
+                botBob = _bot;
+            });
+            cy.getBot(synapse, { displayName: "BotCharlie" }).then(_bot => {
+                botCharlie = _bot;
+            });
+            let roomId: string;
+            cy.createRoom({}).then(_roomId => {
+                roomId = _roomId;
+                cy.inviteUser(roomId, botBob.getUserId());
+                cy.inviteUser(roomId, botCharlie.getUserId());
+                cy.visit('/#/room/' + roomId);
+                // wait until bots joined
+                cy.contains(".mx_TextualEvent", "BotBob and one other were invited and joined").should("exist");
+            });
+
+            cy.openMessageComposerOptions().within(() => {
+                cy.get('[aria-label="Poll"]').click();
+            });
+
+            cy.get('.mx_CompoundDialog').percySnapshotElement('Polls Composer');
+
+            const pollParams = {
+                title: 'Does the polls feature work with multiple selections?',
+                options: ['Yes', 'Indeed', 'Definitely'],
+                multiSelect: true,
+            };
+            createPoll(pollParams);
+
+            // Wait for message to send, get its ID and save as @pollId
+            cy.contains(".mx_RoomView_body .mx_EventTile[data-scroll-tokens]", pollParams.title)
+                .invoke("attr", "data-scroll-tokens").as("pollId");
+
+            cy.get<string>("@pollId").then(pollId => {
+                getPollTile(pollId).percySnapshotElement('Polls Timeline tile - no votes',
+                    { percyCSS: hideTimestampCSS });
+
+                // selected max possible number of votes
+                cy.get('.mx_MPollBody_totalVotes').should('contain', 'you have 3 votes remaining');
+
+                // Bob votes 'Yes' in the poll
+                botVoteForOption(botBob, roomId, pollId, pollParams.options[0], "checkbox");
+
+                // Charlie votes for 'Indeed'
+                botVoteForOption(botCharlie, roomId, pollId, pollParams.options[1], "checkbox");
+
+                // no votes shown until I vote, check bots vote has arrived
+                cy.get('.mx_MPollBody_totalVotes').should('contain', '2 votes cast');
+
+                // I vote 'Definitely'
+                getPollOption(pollId, pollParams.options[2]).click('topLeft');
+
+                // 1 vote for each option
+                expectPollOptionVoteCount(pollId, pollParams.options[0], 1);
+                expectPollOptionVoteCount(pollId, pollParams.options[1], 1);
+                expectPollOptionVoteCount(pollId, pollParams.options[2], 1);
+
+                // I vote 'Yes'
+                getPollOption(pollId, pollParams.options[0]).click('left');
+                // I vote 'Indeed'
+                getPollOption(pollId, pollParams.options[1]).click('bottom');
+
+                // I have no votes left
+                cy.get('.mx_MPollBody_totalVotes').should('contain', 'Based on 5 votes - you have no votes remaining');
+
+                // Charlie votes for 'Yes'
+                botVoteForOption(botCharlie, roomId, pollId, pollParams.options[0], "checkbox");
+
+                // each participant has voted for 'Yes'
+                expectPollOptionVoteCount(pollId, pollParams.options[0], 3);
+                // Charlie and I voted 'Indeed'
+                expectPollOptionVoteCount(pollId, pollParams.options[1], 2);
+                // I voted for 'Definitely'
+                expectPollOptionVoteCount(pollId, pollParams.options[2], 1);
+            });
+        });
+
+        it("should have the correct number of possible selections", () => {
+            let roomId: string;
+            cy.createRoom({}).then(_roomId => {
+                roomId = _roomId;
+                cy.visit('/#/room/' + roomId);
+            });
+
+            cy.openMessageComposerOptions().within(() => {
+                cy.get('[aria-label="Poll"]').click();
+            });
+
+            const pollParams = {
+                title: 'Does this count an empty option?',
+                options: ['Nah', 'Nope', ' '],
+                multiSelect: true,
+            };
+            createPoll(pollParams);
+
+            cy.get('.mx_MPollBody_totalVotes').should('contain', 'you have 2 votes remaining');
+        });
+
+        it("should allow deselecting votes to vote for another option", () => {
+            let roomId: string;
+            cy.createRoom({}).then(_roomId => {
+                roomId = _roomId;
+                cy.visit('/#/room/' + roomId);
+            });
+
+            cy.openMessageComposerOptions().within(() => {
+                cy.get('[aria-label="Poll"]').click();
+            });
+
+            cy.get('.mx_CompoundDialog').percySnapshotElement('Polls Composer');
+
+            const pollParams = {
+                title: 'Can I deselect my votes?',
+                options: ['Yes', 'Indeed', 'Definitely'],
+                multiSelect: true,
+                maxSelections: '2',
+            };
+            createPoll(pollParams);
+
+            // Wait for message to send, get its ID and save as @pollId
+            cy.contains(".mx_RoomView_body .mx_EventTile[data-scroll-tokens]", pollParams.title)
+                .invoke("attr", "data-scroll-tokens").as("pollId");
+
+            cy.get<string>("@pollId").then(pollId => {
+                // vote 'Yes'
+                getPollOption(pollId, pollParams.options[0]).click('topRight');
+
+                // 1 vote for 'Yes'
+                expectPollOptionVoteCount(pollId, pollParams.options[0], 1);
+                // check correct number of remaining votes
+                cy.get('.mx_MPollBody_totalVotes').should('contain', 'you have 1 vote remaining');
+
+                // also vote for 'Indeed'
+                getPollOption(pollId, pollParams.options[1]).click('center');
+
+                // 1 vote for 'Indeed'
+                expectPollOptionVoteCount(pollId, pollParams.options[1], 1);
+                // check correct number of remaining votes
+                cy.get('.mx_MPollBody_totalVotes').should('contain', 'you have no votes remaining');
+
+                // no further votes allowed
+                getPollOption(pollId, pollParams.options[2]).click('center');
+                // no vote for 'Definitely'
+                expectPollOptionVoteCount(pollId, pollParams.options[2], 0);
+
+                // deselect 'Indeed'
+                getPollOption(pollId, pollParams.options[1]).click('left');
+                // no votes for 'Indeed'
+                expectPollOptionVoteCount(pollId, pollParams.options[1], 0);
+                // check correct number of remaining votes
+                cy.get('.mx_MPollBody_totalVotes').should('contain', 'you have 1 vote remaining');
+
+                // vote for 'Definitely'
+                getPollOption(pollId, pollParams.options[2]).click('right');
+                // 1 vote for 'Definitely'
+                expectPollOptionVoteCount(pollId, pollParams.options[2], 1);
+                // check correct number of remaining votes
+                cy.get('.mx_MPollBody_totalVotes').should('contain', 'you have no votes remaining');
+            });
+        });
+    });
 });
diff --git a/res/css/views/dialogs/_PollCreateDialog.pcss b/res/css/views/dialogs/_PollCreateDialog.pcss
index b49fda4db06..7db8b01715c 100644
--- a/res/css/views/dialogs/_PollCreateDialog.pcss
+++ b/res/css/views/dialogs/_PollCreateDialog.pcss
@@ -79,6 +79,9 @@ limitations under the License.
 
     .mx_PollCreateDialog_addOption {
         padding: 0;
+    }
+
+    .mx_PollCreateDialog_maxSelections {
         margin-bottom: 40px; /* arbitrary to create scrollable area under the poll */
     }
 
diff --git a/res/css/views/elements/_StyledRadioButton.pcss b/res/css/views/elements/_StyledRadioButton.pcss
index cc7339ac005..70bee5e7638 100644
--- a/res/css/views/elements/_StyledRadioButton.pcss
+++ b/res/css/views/elements/_StyledRadioButton.pcss
@@ -46,7 +46,8 @@ limitations under the License.
         width: $font-16px;
     }
 
-    input[type="radio"] {
+    input[type="radio"],
+    input[type="checkbox"] {
         /* Remove the OS's representation */
         margin: 0;
         padding: 0;
diff --git a/res/css/views/messages/_MPollBody.pcss b/res/css/views/messages/_MPollBody.pcss
index 7eeb7e2518c..ad2c8f6cce6 100644
--- a/res/css/views/messages/_MPollBody.pcss
+++ b/res/css/views/messages/_MPollBody.pcss
@@ -55,16 +55,21 @@ limitations under the License.
         max-width: 550px;
         background-color: $background;
 
-        .mx_StyledRadioButton, .mx_MPollBody_endedOption {
+        .mx_StyledRadioButton,
+        .mx_StyledCheckbox,
+        .mx_MPollBody_endedOption {
             margin-bottom: 8px;
         }
 
-        .mx_StyledRadioButton_content, .mx_MPollBody_endedOption {
+        .mx_StyledRadioButton_content,
+        .mx_StyledCheckbox_content,
+        .mx_MPollBody_endedOption {
             padding-top: 2px;
             margin-right: 0px;
         }
 
-        .mx_StyledRadioButton_spacer {
+        .mx_StyledRadioButton_spacer,
+        .mx_StyledCheckbox_spacer {
             display: none;
         }
 
@@ -110,12 +115,15 @@ limitations under the License.
     }
 
     /* options not actionable in these states */
-    .mx_MPollBody_option_checked, .mx_MPollBody_option_ended {
+    .mx_MPollBody_option_ended {
         pointer-events: none;
     }
 
-    .mx_StyledRadioButton_checked, .mx_MPollBody_endedOptionWinner {
-        input[type="radio"] + div {
+    .mx_StyledRadioButton_checked,
+    .mx_StyledCheckbox_checked,
+    .mx_MPollBody_endedOptionWinner {
+        input[type="radio"] + div,
+        input[type="checkbox"] + div {
             border-width: 2px;
             border-color: $accent;
             background-color: $accent;
diff --git a/src/components/views/elements/PollCreateDialog.tsx b/src/components/views/elements/PollCreateDialog.tsx
index 3d4cc9826f2..f4f3b77fe17 100644
--- a/src/components/views/elements/PollCreateDialog.tsx
+++ b/src/components/views/elements/PollCreateDialog.tsx
@@ -25,6 +25,7 @@ import {
     PollStartEvent,
 } from "matrix-events-sdk";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { range } from "lodash";
 
 import ScrollableBaseModal, { IScrollableBaseState } from "../dialogs/ScrollableBaseModal";
 import { IDialogProps } from "../dialogs/IDialogProps";
@@ -51,6 +52,7 @@ interface IState extends IScrollableBaseState {
     question: string;
     options: string[];
     busy: boolean;
+    max_selections?: number;
     kind: KNOWN_POLL_KIND;
     autoFocusTarget: FocusTarget;
 }
@@ -85,6 +87,7 @@ function editingInitialState(editingMxEvent: MatrixEvent): IState {
         question: poll.question.text,
         options: poll.answers.map(ans => ans.text),
         busy: false,
+        max_selections: poll.maxSelections,
         kind: poll.kind,
         autoFocusTarget: FocusTarget.Topic,
     };
@@ -138,11 +141,27 @@ export default class PollCreateDialog extends ScrollableBaseModal<IProps, IState
         });
     };
 
+    private maxSelections = () => {
+        // defaults to 1
+        const limit = this.state.options.map(a => a.trim()).filter(a => !!a).length || 1;
+        const count = range(1, limit + 1);
+        const options = count.map((number) => {
+            return <option
+                key={number}
+                value={number}
+            >
+                { number }
+            </option>;
+        });
+        return options;
+    };
+
     private createEvent(): IPartialEvent<object> {
         const pollStart = PollStartEvent.from(
             this.state.question.trim(),
             this.state.options.map(a => a.trim()).filter(a => !!a),
             this.state.kind,
+            this.state.max_selections,
         ).serialize();
 
         if (!this.props.editingMxEvent) {
@@ -270,6 +289,15 @@ export default class PollCreateDialog extends ScrollableBaseModal<IProps, IState
                 this.state.busy &&
                     <div className="mx_PollCreateDialog_busy"><Spinner /></div>
             }
+            <h2>{ _t("Number of votes per person") }</h2>
+            <Field
+                className="mx_PollCreateDialog_maxSelections"
+                element="select"
+                value={String(this.state.max_selections)}
+                onChange={this.onMaxSelectionsChange}
+            >
+                { this.maxSelections() }
+            </Field>
         </div>;
     }
 
@@ -282,6 +310,10 @@ export default class PollCreateDialog extends ScrollableBaseModal<IProps, IState
             ),
         });
     };
+
+    onMaxSelectionsChange = (e: ChangeEvent<HTMLSelectElement>) => {
+        this.setState({ max_selections: Number(e.target.value) });
+    };
 }
 
 function pollTypeNotes(kind: KNOWN_POLL_KIND): string {
diff --git a/src/components/views/elements/StyledCheckbox.tsx b/src/components/views/elements/StyledCheckbox.tsx
index 35422366822..ef1ca6b475b 100644
--- a/src/components/views/elements/StyledCheckbox.tsx
+++ b/src/components/views/elements/StyledCheckbox.tsx
@@ -21,6 +21,7 @@ import classnames from 'classnames';
 export enum CheckboxStyle {
     Solid = "solid",
     Outline = "outline",
+    Circle = "circle", // for polls, uses radio button styling
 }
 
 interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
@@ -49,15 +50,25 @@ export default class StyledCheckbox extends React.PureComponent<IProps, IState>
         /* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
         const { children, className, kind = CheckboxStyle.Solid, inputRef, ...otherProps } = this.props;
 
-        const newClassName = classnames(
-            "mx_Checkbox",
-            className,
-            {
+        const additionalClasses = kind === "circle"
+            ? {
+                "mx_StyledRadioButton": true,
+                "mx_StyledRadioButton_disabled": this.props.disabled,
+                "mx_StyledRadioButton_enabled": !this.props.disabled,
+                "mx_StyledRadioButton_checked": this.props.checked,
+            }
+            : {
+                "mx_Checkbox": true,
                 "mx_Checkbox_hasKind": kind,
                 [`mx_Checkbox_kind_${kind}`]: kind,
-            },
+            };
+
+        const newClassName = classnames(
+            className,
+            additionalClasses,
         );
-        return <span className={newClassName}>
+
+        const checkbox = <React.Fragment>
             <input
                 // Pass through the ref - used for keyboard shortcut access to some buttons
                 ref={inputRef}
@@ -65,17 +76,31 @@ export default class StyledCheckbox extends React.PureComponent<IProps, IState>
                 {...otherProps}
                 type="checkbox"
             />
-            <label htmlFor={this.id}>
-                { /* Using the div to center the image */ }
-                <div className="mx_Checkbox_background">
-                    <div className="mx_Checkbox_checkmark" />
-                </div>
-                { !!this.props.children &&
+        </React.Fragment>;
+
+        if (kind === "circle") {
+            return <label className={newClassName}>
+                { checkbox }
+                { /* Used to render the radio button circle */ }
+                <div><div /></div>
+                <div className="mx_StyledRadioButton_content">{ children }</div>
+                <div className="mx_StyledRadioButton_spacer" />
+            </label>;
+        } else {
+            return <span className={newClassName}>
+                { checkbox }
+                <label htmlFor={this.id}>
+                    { /* Using the div to center the image */ }
+                    <div className="mx_Checkbox_background">
+                        <div className="mx_Checkbox_checkmark" />
+                    </div>
+                    { !!this.props.children &&
                     <div>
                         { this.props.children }
                     </div>
-                }
-            </label>
-        </span>;
+                    }
+                </label>
+            </span>;
+        }
     }
 }
diff --git a/src/components/views/messages/MPollBody.tsx b/src/components/views/messages/MPollBody.tsx
index 7a48c7212a6..0c5e54ed211 100644
--- a/src/components/views/messages/MPollBody.tsx
+++ b/src/components/views/messages/MPollBody.tsx
@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, { SyntheticEvent } from 'react';
 import classNames from 'classnames';
 import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
 import { Relations, RelationsEvent } from 'matrix-js-sdk/src/models/relations';
 import { MatrixClient } from 'matrix-js-sdk/src/matrix';
 import {
+    IPartialEvent,
     M_POLL_END,
     M_POLL_KIND_DISCLOSED,
     M_POLL_RESPONSE,
@@ -41,9 +42,10 @@ import ErrorDialog from '../dialogs/ErrorDialog';
 import { GetRelationsForEvent } from "../rooms/EventTile";
 import PollCreateDialog from "../elements/PollCreateDialog";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import StyledCheckbox, { CheckboxStyle } from '../elements/StyledCheckbox';
 
 interface IState {
-    selected?: string; // Which option was clicked by the local user
+    selections?: string[]; // Holds multiple selections if max_selections > 1
     voteRelations: RelatedRelations; // Voting (response) events
     endRelations: RelatedRelations; // Poll end events
 }
@@ -216,7 +218,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
         super(props);
 
         this.state = {
-            selected: null,
+            selections: [],
             voteRelations: this.fetchVoteRelations(),
             endRelations: this.fetchEndRelations(),
         };
@@ -288,19 +290,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
         this.unselectIfNewEventFromMe();
     };
 
-    private selectOption(answerId: string) {
-        if (this.isEnded()) {
-            return;
-        }
-        const userVotes = this.collectUserVotes();
-        const userId = this.context.getUserId();
-        const myVote = userVotes.get(userId)?.answers[0];
-        if (answerId === myVote) {
-            return;
-        }
-
-        const response = PollResponseEvent.from([answerId], this.props.mxEvent.getId()).serialize();
-
+    private sendContextEvent(response: IPartialEvent<object>): void {
         this.context.sendEvent(
             this.props.mxEvent.getRoomId(),
             response.type,
@@ -317,14 +307,65 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
                 },
             );
         });
+    }
 
-        this.setState({ selected: answerId });
+    private selectOption(answerId: string) {
+        if (this.isEnded()) {
+            return;
+        }
+        const userVotes = this.collectUserVotes();
+        const userId = this.context.getUserId();
+        const myVote = userVotes.get(userId)?.answers[0];
+        if (answerId === myVote) {
+            return;
+        }
+
+        const response = PollResponseEvent.from([answerId], this.props.mxEvent.getId()).serialize();
+        this.sendContextEvent(response);
+        this.setState({ selections: [answerId] });
     }
 
     private onOptionSelected = (e: React.FormEvent<HTMLInputElement>): void => {
         this.selectOption(e.currentTarget.value);
     };
 
+    // allow multiple selections
+    private selectMultipleOptions = (answerId: string) => {
+        if (this.isEnded()) {
+            return;
+        }
+        const userVotes = this.collectUserVotes();
+        const userId = this.context.getUserId();
+        const myVotes = userVotes.get(userId)?.answers ?? [];
+
+        if (!myVotes.includes(answerId)) {
+            if (myVotes.length >= this.maxSelections()) {
+                //don't allow voting for more than maxSelections
+                return;
+            }
+            myVotes.push(answerId);
+        } else {
+            // deselect
+            const index = myVotes.indexOf(answerId, 0);
+            if (index > -1) {
+                myVotes.splice(index, 1);
+            }
+        }
+
+        const response = PollResponseEvent.from(myVotes, this.props.mxEvent.getId()).serialize();
+        this.sendContextEvent(response);
+        this.setState({ selections: myVotes });
+    };
+
+    private onMultiSelection = (e: React.FormEvent<HTMLInputElement>): void => {
+        this.selectMultipleOptions(e.currentTarget.value);
+    };
+
+    private maxSelections(): number {
+        const poll = this.props.mxEvent.unstableExtensibleEvent as PollStartEvent;
+        return poll.maxSelections;
+    }
+
     private fetchVoteRelations(): RelatedRelations | null {
         return this.fetchRelations(M_POLL_RESPONSE);
     }
@@ -356,6 +397,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
      * @returns userId -> UserVote
      */
     private collectUserVotes(): Map<string, UserVote> {
+        const selections = this.maxSelections() > 1 ? null : this.state.selections[0];
         return collectUserVotes(
             allVotes(
                 this.props.mxEvent,
@@ -364,7 +406,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
                 this.state.endRelations,
             ),
             this.context.getUserId(),
-            this.state.selected,
+            selections,
         );
     }
 
@@ -381,7 +423,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
             .filter(isPollResponse)
             .filter((mxEvent: MatrixEvent) =>
                 !this.seenEventIds.includes(mxEvent.getId()));
-        let newSelected = this.state.selected;
+        let newSelected = this.state.selections[0];
 
         if (newEvents.length > 0) {
             for (const mxEvent of newEvents) {
@@ -392,7 +434,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
         }
         const newEventIds = newEvents.map((mxEvent: MatrixEvent) => mxEvent.getId());
         this.seenEventIds = this.seenEventIds.concat(newEventIds);
-        this.setState({ selected: newSelected });
+        this.setState({ selections: [newSelected] });
     }
 
     private totalVotes(collectedVotes: Map<string, number>): number {
@@ -423,18 +465,30 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
         const winCount = Math.max(...votes.values());
         const userId = this.context.getUserId();
         const myVote = userVotes.get(userId)?.answers[0];
+        const myVotes = userVotes.get(userId)?.answers;
         const disclosed = M_POLL_KIND_DISCLOSED.matches(poll.kind.name);
+        const maxSelections = poll.maxSelections;
+        const votesLeft = myVotes ? maxSelections - myVotes.length : maxSelections;
 
         // Disclosed: votes are hidden until I vote or the poll ends
         // Undisclosed: votes are hidden until poll ends
         const showResults = ended || (disclosed && myVote !== undefined);
 
         let totalText: string;
+        let remainderText = "";
+        if (maxSelections > 1) {
+            remainderText = votesLeft > 0 ? " - " + _t(
+                "you have %(count)s votes remaining",
+                { count: votesLeft },
+            )
+                : " - " + _t("you have no votes remaining");
+        }
         if (ended) {
             totalText = _t(
                 "Final result based on %(count)s votes",
                 { count: totalVotes },
             );
+            remainderText = "";
         } else if (!disclosed) {
             totalText = _t("Results will be visible when the poll is ended");
         } else if (myVote === undefined) {
@@ -470,8 +524,8 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
                         }
 
                         const checked = (
-                            (!ended && myVote === answer.id) ||
-                            (ended && answerVotes === winCount)
+                            (!ended && (myVote === answer.id || myVotes?.includes(answer.id)) ||
+                            (ended && answerVotes === winCount))
                         );
                         const cls = classNames({
                             "mx_MPollBody_option": true,
@@ -487,7 +541,15 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
                         return <div
                             key={answer.id}
                             className={cls}
-                            onClick={() => this.selectOption(answer.id)}
+                            onClick={(e: SyntheticEvent) => {
+                                if (maxSelections === 1) {
+                                    this.selectOption(answer.id);
+                                    return;
+                                }
+                                if (e.target === e.currentTarget) {
+                                    this.selectMultipleOptions(answer.id);
+                                }
+                            }}
                         >
                             { (
                                 ended
@@ -500,9 +562,18 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
                                         answer={answer}
                                         checked={checked}
                                         votesText={votesText}
-                                        onOptionSelected={this.onOptionSelected} />
+                                        maxSelections={maxSelections}
+                                        onOptionSelected={this.onOptionSelected}
+                                        onMultiSelection={this.onMultiSelection} />
                             ) }
-                            <div className="mx_MPollBody_popularityBackground">
+                            <div
+                                className="mx_MPollBody_popularityBackground"
+                                onClick={() => {
+                                    if (maxSelections > 1) {
+                                        this.selectMultipleOptions(answer.id);
+                                    }
+                                }}
+                            >
                                 <div
                                     className="mx_MPollBody_popularityAmount"
                                     style={{ "width": `${answerPercent}%` }}
@@ -514,6 +585,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
             </div>
             <div className="mx_MPollBody_totalVotes">
                 { totalText }
+                { remainderText }
             </div>
         </div>;
     }
@@ -547,26 +619,48 @@ interface ILivePollOptionProps {
     answer: PollAnswerSubevent;
     checked: boolean;
     votesText: string;
+    maxSelections: number;
     onOptionSelected: (e: React.FormEvent<HTMLInputElement>) => void;
+    onMultiSelection: (e: React.FormEvent<HTMLInputElement>) => void;
 }
 
 function LivePollOption(props: ILivePollOptionProps) {
-    return <StyledRadioButton
-        className="mx_MPollBody_live-option"
-        name={`poll_answer_select-${props.pollId}`}
-        value={props.answer.id}
-        checked={props.checked}
-        onChange={props.onOptionSelected}
-    >
-        <div className="mx_MPollBody_optionDescription">
-            <div className="mx_MPollBody_optionText">
-                { props.answer.text }
+    if (props.maxSelections === 1) {
+        return <StyledRadioButton
+            className="mx_MPollBody_live-option"
+            name={`poll_answer_select-${props.pollId}`}
+            value={props.answer.id}
+            checked={props.checked}
+            onChange={props.onOptionSelected}
+        >
+            <div className="mx_MPollBody_optionDescription">
+                <div className="mx_MPollBody_optionText">
+                    { props.answer.text }
+                </div>
+                <div className="mx_MPollBody_optionVoteCount">
+                    { props.votesText }
+                </div>
             </div>
-            <div className="mx_MPollBody_optionVoteCount">
-                { props.votesText }
+        </StyledRadioButton>;
+    } else { // allow multiple selections
+        return <StyledCheckbox
+            className="mx_MPollBody_live-option"
+            kind={CheckboxStyle.Circle}
+            name={`poll_answer_select-${props.pollId}`}
+            value={props.answer.id}
+            checked={props.checked}
+            onChange={props.onMultiSelection}
+        >
+            <div className="mx_MPollBody_optionDescription">
+                <div className="mx_MPollBody_optionText">
+                    { props.answer.text }
+                </div>
+                <div className="mx_MPollBody_optionVoteCount">
+                    { props.votesText }
+                </div>
             </div>
-        </div>
-    </StyledRadioButton>;
+        </StyledCheckbox>;
+    }
 }
 
 export class UserVote {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 62be5c8f788..102e70eb119 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2345,6 +2345,9 @@
     "Sorry, you can't edit a poll after votes have been cast.": "Sorry, you can't edit a poll after votes have been cast.",
     "Vote not registered": "Vote not registered",
     "Sorry, your vote was not registered. Please try again.": "Sorry, your vote was not registered. Please try again.",
+    "you have %(count)s votes remaining|other": "you have %(count)s votes remaining",
+    "you have %(count)s votes remaining|one": "you have %(count)s vote remaining",
+    "you have no votes remaining": "you have no votes remaining",
     "Final result based on %(count)s votes|other": "Final result based on %(count)s votes",
     "Final result based on %(count)s votes|one": "Final result based on %(count)s vote",
     "Results will be visible when the poll is ended": "Results will be visible when the poll is ended",
@@ -2527,6 +2530,7 @@
     "Option %(number)s": "Option %(number)s",
     "Write an option": "Write an option",
     "Add option": "Add option",
+    "Number of votes per person": "Number of votes per person",
     "Voters see results as soon as they have voted": "Voters see results as soon as they have voted",
     "Results are only revealed when you end the poll": "Results are only revealed when you end the poll",
     "Power level": "Power level",
diff --git a/test/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap
index 48502f719b5..840247eb6f1 100644
--- a/test/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap
+++ b/test/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap
@@ -220,7 +220,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
                   </span>
                 </div>
                 <span
-                  class="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+                  class="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
                 >
                   <input
                     id="include-attachments"
@@ -445,7 +445,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
                     </span>
                   </div>
                   <span
-                    class="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+                    class="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
                   >
                     <input
                       id="include-attachments"
@@ -788,7 +788,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
               onChange={[Function]}
             >
               <span
-                className="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+                className="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
               >
                 <input
                   checked={false}
@@ -1073,7 +1073,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
                 </span>
               </div>
               <span
-                class="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+                class="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
               >
                 <input
                   id="include-attachments"
@@ -1298,7 +1298,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
                   </span>
                 </div>
                 <span
-                  class="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+                  class="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
                 >
                   <input
                     id="include-attachments"
@@ -1641,7 +1641,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
             onChange={[Function]}
           >
             <span
-              className="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+              className="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
             >
               <input
                 checked={false}
@@ -1913,7 +1913,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
               </span>
             </div>
             <span
-              class="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+              class="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
             >
               <input
                 id="include-attachments"
@@ -2138,7 +2138,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
                 </span>
               </div>
               <span
-                class="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+                class="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
               >
                 <input
                   id="include-attachments"
@@ -2481,7 +2481,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
           onChange={[Function]}
         >
           <span
-            className="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+            className="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
           >
             <input
               checked={false}
@@ -2834,7 +2834,7 @@ exports[`<ExportDialog /> renders export dialog 1`] = `
         onChange={[Function]}
       >
         <span
-          className="mx_Checkbox mx_ExportDialog_attachments-checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+          className="mx_ExportDialog_attachments-checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
         >
           <input
             checked={false}
diff --git a/test/components/views/elements/PollCreateDialog-test.tsx b/test/components/views/elements/PollCreateDialog-test.tsx
index 1efb988409b..3c09b4041ba 100644
--- a/test/components/views/elements/PollCreateDialog-test.tsx
+++ b/test/components/views/elements/PollCreateDialog-test.tsx
@@ -128,6 +128,28 @@ describe("PollCreateDialog", () => {
         expect(dialog.html()).toMatchSnapshot();
     });
 
+    it("shows the correct number of possible votes per person", () => {
+        const dialog = mount(
+            <PollCreateDialog room={createRoom()} onFinished={jest.fn()} />,
+        );
+        expect(dialog.find("select").at(1).children().length).toEqual(1); // defaults to 1
+        changeValue(dialog, "Option 1", "As many as my neighbour");
+        changeValue(dialog, "Option 2", "The question is meaningless");
+        dialog.find("div.mx_PollCreateDialog_addOption").simulate("click");
+        changeValue(dialog, "Option 3", "");
+        expect(dialog.find("select").at(1).children().length).toEqual(2); // doesn't count empty options
+    });
+
+    it("allows setting the number of allowed votes per person", () => {
+        const dialog = mount(
+            <PollCreateDialog room={createRoom()} onFinished={jest.fn()} />,
+        );
+        changeMaxSelections(dialog, 2);
+        expect(
+            dialog.find('select').at(1).prop("value"),
+        ).toEqual("2");
+    });
+
     it("doesn't allow submitting until there are options", () => {
         const dialog = mount(
             <PollCreateDialog room={createRoom()} onFinished={jest.fn()} />,
@@ -156,7 +178,7 @@ describe("PollCreateDialog", () => {
             <PollCreateDialog room={createRoom()} onFinished={jest.fn()} />,
         );
         expect(
-            dialog.find('select').prop("value"),
+            dialog.find('select').at(0).prop("value"),
         ).toEqual(M_POLL_KIND_DISCLOSED.name);
         expect(
             dialog.find('p').text(),
@@ -169,7 +191,7 @@ describe("PollCreateDialog", () => {
         );
         changeKind(dialog, M_POLL_KIND_UNDISCLOSED.name);
         expect(
-            dialog.find('select').prop("value"),
+            dialog.find('select').at(0).prop("value"),
         ).toEqual(M_POLL_KIND_UNDISCLOSED.name);
         expect(
             dialog.find('p').text(),
@@ -183,7 +205,7 @@ describe("PollCreateDialog", () => {
         changeKind(dialog, M_POLL_KIND_UNDISCLOSED.name);
         changeKind(dialog, M_POLL_KIND_DISCLOSED.name);
         expect(
-            dialog.find('select').prop("value"),
+            dialog.find('select').at(0).prop("value"),
         ).toEqual(M_POLL_KIND_DISCLOSED.name);
         expect(
             dialog.find('p').text(),
@@ -209,7 +231,7 @@ describe("PollCreateDialog", () => {
         );
 
         expect(
-            dialog.find('select').prop("value"),
+            dialog.find('select').at(0).prop("value"),
         ).toEqual(M_POLL_KIND_UNDISCLOSED.name);
         expect(
             dialog.find('p').text(),
@@ -345,7 +367,14 @@ function changeValue(wrapper: ReactWrapper, labelText: string, value: string) {
 }
 
 function changeKind(wrapper: ReactWrapper, value: string) {
-    wrapper.find("select").simulate(
+    wrapper.find("select").at(0).simulate(
+        "change",
+        { target: { value: value } },
+    );
+}
+
+function changeMaxSelections(wrapper: ReactWrapper, value: number) {
+    wrapper.find("select").at(1).simulate(
         "change",
         { target: { value: value } },
     );
diff --git a/test/components/views/elements/__snapshots__/PollCreateDialog-test.tsx.snap b/test/components/views/elements/__snapshots__/PollCreateDialog-test.tsx.snap
index 1bcf17dcd42..ab64ca80d02 100644
--- a/test/components/views/elements/__snapshots__/PollCreateDialog-test.tsx.snap
+++ b/test/components/views/elements/__snapshots__/PollCreateDialog-test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PollCreateDialog renders a blank poll 1`] = `"<div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div><div data-focus-lock-disabled="false" role="dialog" aria-labelledby="mx_CompoundDialog_title" aria-describedby="mx_CompoundDialog_content" class="mx_CompoundDialog mx_ScrollableBaseDialog"><div class="mx_CompoundDialog_header"><h1>Create poll</h1><div aria-label="Close dialog" role="button" tabindex="0" class="mx_AccessibleButton mx_CompoundDialog_cancelButton"></div></div><form><div class="mx_CompoundDialog_content"><div class="mx_PollCreateDialog"><h2>Poll type</h2><div class="mx_Field mx_Field_select"><select type="text" id="mx_Field_1"><option value="org.matrix.msc3381.poll.disclosed">Open poll</option><option value="org.matrix.msc3381.poll.undisclosed">Closed poll</option></select><label for="mx_Field_1"></label></div><p>Voters see results as soon as they have voted</p><h2>What is your poll question or topic?</h2><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="poll-topic-input" maxlength="340" label="Question or topic" placeholder="Write something..." type="text" value=""><label for="poll-topic-input">Question or topic</label></div><h2>Create options</h2><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_0" maxlength="340" label="Option 1" placeholder="Write an option" type="text" value=""><label for="pollcreate_option_0">Option 1</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_1" maxlength="340" label="Option 2" placeholder="Write an option" type="text" value=""><label for="pollcreate_option_1">Option 2</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_addOption mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary">Add option</div></div></div><div class="mx_CompoundDialog_footer"><div role="button" tabindex="0" class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline">Cancel</div><button type="submit" role="button" tabindex="0" aria-disabled="true" disabled="" class="mx_AccessibleButton mx_Dialog_nonDialogButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary mx_AccessibleButton_disabled">Create Poll</button></div></form></div><div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>"`;
+exports[`PollCreateDialog renders a blank poll 1`] = `"<div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div><div data-focus-lock-disabled="false" role="dialog" aria-labelledby="mx_CompoundDialog_title" aria-describedby="mx_CompoundDialog_content" class="mx_CompoundDialog mx_ScrollableBaseDialog"><div class="mx_CompoundDialog_header"><h1>Create poll</h1><div aria-label="Close dialog" role="button" tabindex="0" class="mx_AccessibleButton mx_CompoundDialog_cancelButton"></div></div><form><div class="mx_CompoundDialog_content"><div class="mx_PollCreateDialog"><h2>Poll type</h2><div class="mx_Field mx_Field_select"><select type="text" id="mx_Field_1"><option value="org.matrix.msc3381.poll.disclosed">Open poll</option><option value="org.matrix.msc3381.poll.undisclosed">Closed poll</option></select><label for="mx_Field_1"></label></div><p>Voters see results as soon as they have voted</p><h2>What is your poll question or topic?</h2><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="poll-topic-input" maxlength="340" label="Question or topic" placeholder="Write something..." type="text" value=""><label for="poll-topic-input">Question or topic</label></div><h2>Create options</h2><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_0" maxlength="340" label="Option 1" placeholder="Write an option" type="text" value=""><label for="pollcreate_option_0">Option 1</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_1" maxlength="340" label="Option 2" placeholder="Write an option" type="text" value=""><label for="pollcreate_option_1">Option 2</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_addOption mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary">Add option</div><h2>Number of votes per person</h2><div class="mx_Field mx_Field_select mx_PollCreateDialog_maxSelections"><select type="text" id="mx_Field_2"><option value="1">1</option></select><label for="mx_Field_2"></label></div></div></div><div class="mx_CompoundDialog_footer"><div role="button" tabindex="0" class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline">Cancel</div><button type="submit" role="button" tabindex="0" aria-disabled="true" disabled="" class="mx_AccessibleButton mx_Dialog_nonDialogButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary mx_AccessibleButton_disabled">Create Poll</button></div></form></div><div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>"`;
 
-exports[`PollCreateDialog renders a question and some options 1`] = `"<div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div><div data-focus-lock-disabled="false" role="dialog" aria-labelledby="mx_CompoundDialog_title" aria-describedby="mx_CompoundDialog_content" class="mx_CompoundDialog mx_ScrollableBaseDialog"><div class="mx_CompoundDialog_header"><h1>Create poll</h1><div aria-label="Close dialog" role="button" tabindex="0" class="mx_AccessibleButton mx_CompoundDialog_cancelButton"></div></div><form><div class="mx_CompoundDialog_content"><div class="mx_PollCreateDialog"><h2>Poll type</h2><div class="mx_Field mx_Field_select"><select type="text" id="mx_Field_4"><option value="org.matrix.msc3381.poll.disclosed">Open poll</option><option value="org.matrix.msc3381.poll.undisclosed">Closed poll</option></select><label for="mx_Field_4"></label></div><p>Voters see results as soon as they have voted</p><h2>What is your poll question or topic?</h2><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="poll-topic-input" maxlength="340" label="Question or topic" placeholder="Write something..." type="text" value="How many turnips is the optimal number?"><label for="poll-topic-input">Question or topic</label></div><h2>Create options</h2><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_0" maxlength="340" label="Option 1" placeholder="Write an option" type="text" value="As many as my neighbour"><label for="pollcreate_option_0">Option 1</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_1" maxlength="340" label="Option 2" placeholder="Write an option" type="text" value="The question is meaningless"><label for="pollcreate_option_1">Option 2</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_2" maxlength="340" label="Option 3" placeholder="Write an option" type="text" value="Mu"><label for="pollcreate_option_2">Option 3</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_addOption mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary">Add option</div></div></div><div class="mx_CompoundDialog_footer"><div role="button" tabindex="0" class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline">Cancel</div><button type="submit" role="button" tabindex="0" class="mx_AccessibleButton mx_Dialog_nonDialogButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary">Create Poll</button></div></form></div><div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>"`;
+exports[`PollCreateDialog renders a question and some options 1`] = `"<div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div><div data-focus-lock-disabled="false" role="dialog" aria-labelledby="mx_CompoundDialog_title" aria-describedby="mx_CompoundDialog_content" class="mx_CompoundDialog mx_ScrollableBaseDialog"><div class="mx_CompoundDialog_header"><h1>Create poll</h1><div aria-label="Close dialog" role="button" tabindex="0" class="mx_AccessibleButton mx_CompoundDialog_cancelButton"></div></div><form><div class="mx_CompoundDialog_content"><div class="mx_PollCreateDialog"><h2>Poll type</h2><div class="mx_Field mx_Field_select"><select type="text" id="mx_Field_7"><option value="org.matrix.msc3381.poll.disclosed">Open poll</option><option value="org.matrix.msc3381.poll.undisclosed">Closed poll</option></select><label for="mx_Field_7"></label></div><p>Voters see results as soon as they have voted</p><h2>What is your poll question or topic?</h2><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="poll-topic-input" maxlength="340" label="Question or topic" placeholder="Write something..." type="text" value="How many turnips is the optimal number?"><label for="poll-topic-input">Question or topic</label></div><h2>Create options</h2><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_0" maxlength="340" label="Option 1" placeholder="Write an option" type="text" value="As many as my neighbour"><label for="pollcreate_option_0">Option 1</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_1" maxlength="340" label="Option 2" placeholder="Write an option" type="text" value="The question is meaningless"><label for="pollcreate_option_1">Option 2</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_2" maxlength="340" label="Option 3" placeholder="Write an option" type="text" value="Mu"><label for="pollcreate_option_2">Option 3</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_addOption mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary">Add option</div><h2>Number of votes per person</h2><div class="mx_Field mx_Field_select mx_PollCreateDialog_maxSelections"><select type="text" id="mx_Field_8"><option value="1">1</option><option value="2">2</option><option value="3">3</option></select><label for="mx_Field_8"></label></div></div></div><div class="mx_CompoundDialog_footer"><div role="button" tabindex="0" class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline">Cancel</div><button type="submit" role="button" tabindex="0" class="mx_AccessibleButton mx_Dialog_nonDialogButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary">Create Poll</button></div></form></div><div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>"`;
 
-exports[`PollCreateDialog renders info from a previous event 1`] = `"<div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div><div data-focus-lock-disabled="false" role="dialog" aria-labelledby="mx_CompoundDialog_title" aria-describedby="mx_CompoundDialog_content" class="mx_CompoundDialog mx_ScrollableBaseDialog"><div class="mx_CompoundDialog_header"><h1>Edit poll</h1><div aria-label="Close dialog" role="button" tabindex="0" class="mx_AccessibleButton mx_CompoundDialog_cancelButton"></div></div><form><div class="mx_CompoundDialog_content"><div class="mx_PollCreateDialog"><h2>Poll type</h2><div class="mx_Field mx_Field_select"><select type="text" id="mx_Field_5"><option value="org.matrix.msc3381.poll.disclosed">Open poll</option><option value="org.matrix.msc3381.poll.undisclosed">Closed poll</option></select><label for="mx_Field_5"></label></div><p>Voters see results as soon as they have voted</p><h2>What is your poll question or topic?</h2><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="poll-topic-input" maxlength="340" label="Question or topic" placeholder="Write something..." type="text" value="Poll Q"><label for="poll-topic-input">Question or topic</label></div><h2>Create options</h2><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_0" maxlength="340" label="Option 1" placeholder="Write an option" type="text" value="Answer 1"><label for="pollcreate_option_0">Option 1</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_1" maxlength="340" label="Option 2" placeholder="Write an option" type="text" value="Answer 2"><label for="pollcreate_option_1">Option 2</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_addOption mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary">Add option</div></div></div><div class="mx_CompoundDialog_footer"><div role="button" tabindex="0" class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline">Cancel</div><button type="submit" role="button" tabindex="0" class="mx_AccessibleButton mx_Dialog_nonDialogButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary">Done</button></div></form></div><div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>"`;
+exports[`PollCreateDialog renders info from a previous event 1`] = `"<div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div><div data-focus-lock-disabled="false" role="dialog" aria-labelledby="mx_CompoundDialog_title" aria-describedby="mx_CompoundDialog_content" class="mx_CompoundDialog mx_ScrollableBaseDialog"><div class="mx_CompoundDialog_header"><h1>Edit poll</h1><div aria-label="Close dialog" role="button" tabindex="0" class="mx_AccessibleButton mx_CompoundDialog_cancelButton"></div></div><form><div class="mx_CompoundDialog_content"><div class="mx_PollCreateDialog"><h2>Poll type</h2><div class="mx_Field mx_Field_select"><select type="text" id="mx_Field_9"><option value="org.matrix.msc3381.poll.disclosed">Open poll</option><option value="org.matrix.msc3381.poll.undisclosed">Closed poll</option></select><label for="mx_Field_9"></label></div><p>Voters see results as soon as they have voted</p><h2>What is your poll question or topic?</h2><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="poll-topic-input" maxlength="340" label="Question or topic" placeholder="Write something..." type="text" value="Poll Q"><label for="poll-topic-input">Question or topic</label></div><h2>Create options</h2><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_0" maxlength="340" label="Option 1" placeholder="Write an option" type="text" value="Answer 1"><label for="pollcreate_option_0">Option 1</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div class="mx_PollCreateDialog_option"><div class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft mx_Field_placeholderIsHint"><input id="pollcreate_option_1" maxlength="340" label="Option 2" placeholder="Write an option" type="text" value="Answer 2"><label for="pollcreate_option_1">Option 2</label></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_removeOption"></div></div><div role="button" tabindex="0" class="mx_AccessibleButton mx_PollCreateDialog_addOption mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary">Add option</div><h2>Number of votes per person</h2><div class="mx_Field mx_Field_select mx_PollCreateDialog_maxSelections"><select type="text" id="mx_Field_10"><option value="1">1</option><option value="2">2</option></select><label for="mx_Field_10"></label></div></div></div><div class="mx_CompoundDialog_footer"><div role="button" tabindex="0" class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline">Cancel</div><button type="submit" role="button" tabindex="0" class="mx_AccessibleButton mx_Dialog_nonDialogButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary">Done</button></div></form></div><div data-focus-guard="true" tabindex="0" style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"></div>"`;
diff --git a/test/components/views/messages/MPollBody-test.tsx b/test/components/views/messages/MPollBody-test.tsx
index e462584098e..4096879869b 100644
--- a/test/components/views/messages/MPollBody-test.tsx
+++ b/test/components/views/messages/MPollBody-test.tsx
@@ -1015,6 +1015,100 @@ describe("MPollBody", () => {
         const body = newMPollBody(votes, ends, null, false);
         expect(body.html()).toMatchSnapshot();
     });
+
+    describe("multiple selection poll", () => {
+        it("should render checkboxes", () => {
+            const maxSelections = 2;
+            const body = newMPollBody([], [], null, true, maxSelections);
+            expect(body.find('input[type="checkbox"]')).toHaveLength(4);
+        });
+
+        it("should be revertable to a regular poll by editing", () => {
+            const pollEvent = new MatrixEvent({
+                "type": M_POLL_START.name,
+                "event_id": "$mypoll",
+                "room_id": "#myroom:example.com",
+                "content": newPollStart(null, null, true, 3),
+            });
+            let body = newMPollBodyFromEvent(pollEvent, []);
+            expect(body.find('input[type="checkbox"]')).toHaveLength(4);
+            const replacingEvent = new MatrixEvent({
+                "type": M_POLL_START.name,
+                "event_id": "$mypollreplacement",
+                "room_id": "#myroom:example.com",
+                "content": {
+                    "m.new_content": newPollStart(null, null, true, 1),
+                },
+            });
+            pollEvent.makeReplaced(replacingEvent);
+            body = newMPollBodyFromEvent(pollEvent, []);
+            expect(body.find('input[type="radio"]')).toHaveLength(4);
+        });
+
+        it("should allow voting for more than one option", () => {
+            const maxSelections = 4;
+            const votes = [
+                responseEvent("@me:example.com", "italian"),
+            ];
+            const body = newMPollBody(votes, [], null, true, maxSelections);
+
+            clickCheckbox(body, "pizza");
+            clickCheckbox(body, "poutine");
+            expect(body.find(".mx_MPollBody_option_checked")).toHaveLength(3);
+        });
+
+        it("should display the correct amount of votes remaining", () => {
+            const maxSelections = 2;
+            const votes = [
+                responseEvent("@me:example.com", "italian"),
+            ];
+            const body = newMPollBody(votes, [], null, true, maxSelections);
+
+            expect(body.find(".mx_MPollBody_totalVotes").text()).toBe("Based on 1 vote - you have 1 vote remaining");
+            clickCheckbox(body, "poutine");
+            expect(body.find(".mx_MPollBody_totalVotes").text()).toBe("Based on 2 votes - you have no votes remaining");
+        });
+
+        it("should deselect a checked option if clicked", () => {
+            const maxSelections = 2;
+            const votes = [
+                responseEvent("@me:example.com", "pizza"),
+            ];
+            const body = newMPollBody(votes, [], null, true, maxSelections);
+
+            expect(body.find(".mx_MPollBody_option_checked")).toHaveLength(1);
+            clickCheckbox(body, "pizza");
+            expect(body.find(".mx_MPollBody_option_checked")).toHaveLength(0);
+        });
+
+        it("should not allow voting if poll has ended", () => {
+            const maxSelections = 2;
+            const votes = [
+                responseEvent("@me:example.com", "pizza"),
+            ];
+            const ends = [
+                endEvent("@me:example.com", 12),
+            ];
+            const body = newMPollBody(votes, ends, null, true, maxSelections);
+
+            clickCheckbox(body, "poutine");
+            expect(mockClient.sendEvent).not.toHaveBeenCalled();
+            expect(body.find(".mx_MPollBody_option_checked")).toHaveLength(1);
+        });
+
+        it("should not allow voting if there are no votes remaining", () => {
+            const maxSelections = 3;
+            const votes = [
+                responseEvent("@me:example.com", "italian"),
+            ];
+            const body = newMPollBody(votes, [], null, true, maxSelections);
+
+            clickCheckbox(body, "pizza");
+            clickCheckbox(body, "poutine");
+            clickCheckbox(body, "wings");
+            expect(body.find(".mx_MPollBody_option_checked")).toHaveLength(3);
+        });
+    });
 });
 
 function newVoteRelations(relationEvents: Array<MatrixEvent>): Relations {
@@ -1041,12 +1135,13 @@ function newMPollBody(
     endEvents: Array<MatrixEvent> = [],
     answers?: POLL_ANSWER[],
     disclosed = true,
+    maxSelections?: number,
 ): ReactWrapper {
     const mxEvent = new MatrixEvent({
         "type": M_POLL_START.name,
         "event_id": "$mypoll",
         "room_id": "#myroom:example.com",
-        "content": newPollStart(answers, null, disclosed),
+        "content": newPollStart(answers, null, disclosed, maxSelections),
     });
     return newMPollBodyFromEvent(mxEvent, relationEvents, endEvents);
 }
@@ -1095,6 +1190,12 @@ function clickRadio(wrapper: ReactWrapper, value: string) {
     div.simulate("click");
 }
 
+function clickCheckbox(wrapper: ReactWrapper, value: string) {
+    const div = wrapper.find('div.mx_MPollBody_option').findWhere(w => w.key() === value);
+    expect(div).toHaveLength(1);
+    div.simulate("click");
+}
+
 function clickEndedOption(wrapper: ReactWrapper, value: string) {
     const div = wrapper.find(`div[data-value="${value}"]`);
     expect(div).toHaveLength(1);
@@ -1133,6 +1234,7 @@ function newPollStart(
     answers?: POLL_ANSWER[],
     question?: string,
     disclosed = true,
+    maxSelections?: number,
 ): M_POLL_START_EVENT_CONTENT {
     if (!answers) {
         answers = [
@@ -1164,6 +1266,7 @@ function newPollStart(
                     : M_POLL_KIND_UNDISCLOSED.name
             ),
             "answers": answers,
+            "max_selections": maxSelections,
         },
         [M_TEXT.name]: fallback,
     };
diff --git a/test/components/views/messages/__snapshots__/MPollBody-test.tsx.snap b/test/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
index e4039b82b6b..4e7bb8c69a5 100644
--- a/test/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
+++ b/test/components/views/messages/__snapshots__/MPollBody-test.tsx.snap
@@ -34,6 +34,7 @@ exports[`MPollBody renders a finished poll 1`] = `
             },
           ],
           "kind": "org.matrix.msc3381.poll.disclosed",
+          "max_selections": undefined,
           "question": {
             "org.matrix.msc1767.text": "What should we order for the party?",
           },
@@ -108,6 +109,7 @@ exports[`MPollBody renders a finished poll 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -170,6 +172,7 @@ exports[`MPollBody renders a finished poll 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -232,6 +235,7 @@ exports[`MPollBody renders a finished poll 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -294,6 +298,7 @@ exports[`MPollBody renders a finished poll 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -349,6 +354,7 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
             },
           ],
           "kind": "org.matrix.msc3381.poll.disclosed",
+          "max_selections": undefined,
           "question": {
             "org.matrix.msc1767.text": "What should we order for the party?",
           },
@@ -423,6 +429,7 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -485,6 +492,7 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -547,6 +555,7 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -609,6 +618,7 @@ exports[`MPollBody renders a finished poll with multiple winners 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -664,6 +674,7 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
             },
           ],
           "kind": "org.matrix.msc3381.poll.disclosed",
+          "max_selections": undefined,
           "question": {
             "org.matrix.msc1767.text": "What should we order for the party?",
           },
@@ -738,6 +749,7 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -800,6 +812,7 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -862,6 +875,7 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -924,6 +938,7 @@ exports[`MPollBody renders a finished poll with no votes 1`] = `
         </EndedPollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -979,6 +994,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             },
           ],
           "kind": "org.matrix.msc3381.poll.disclosed",
+          "max_selections": undefined,
           "question": {
             "org.matrix.msc1767.text": "What should we order for the party?",
           },
@@ -1029,6 +1045,8 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText=""
@@ -1078,6 +1096,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1116,6 +1135,8 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText=""
@@ -1165,6 +1186,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1203,6 +1225,8 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText=""
@@ -1252,6 +1276,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1290,6 +1315,8 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText=""
@@ -1339,6 +1366,7 @@ exports[`MPollBody renders a poll that I have not voted in 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1394,6 +1422,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             },
           ],
           "kind": "org.matrix.msc3381.poll.disclosed",
+          "max_selections": undefined,
           "question": {
             "org.matrix.msc1767.text": "What should we order for the party?",
           },
@@ -1444,6 +1473,8 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText="1 vote"
@@ -1495,6 +1526,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1533,6 +1565,8 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText="0 votes"
@@ -1584,6 +1618,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1622,6 +1657,8 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             }
           }
           checked={true}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText="3 votes"
@@ -1673,6 +1710,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1711,6 +1749,8 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText="1 vote"
@@ -1762,6 +1802,7 @@ exports[`MPollBody renders a poll with local, non-local and invalid votes 1`] =
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1817,6 +1858,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             },
           ],
           "kind": "org.matrix.msc3381.poll.disclosed",
+          "max_selections": undefined,
           "question": {
             "org.matrix.msc1767.text": "What should we order for the party?",
           },
@@ -1867,6 +1909,8 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText=""
@@ -1916,6 +1960,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -1954,6 +1999,8 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText=""
@@ -2003,6 +2050,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -2041,6 +2089,8 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText=""
@@ -2090,6 +2140,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -2128,6 +2179,8 @@ exports[`MPollBody renders a poll with no votes 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText=""
@@ -2177,6 +2230,7 @@ exports[`MPollBody renders a poll with no votes 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -2232,6 +2286,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             },
           ],
           "kind": "org.matrix.msc3381.poll.disclosed",
+          "max_selections": undefined,
           "question": {
             "org.matrix.msc1767.text": "What should we order for the party?",
           },
@@ -2282,6 +2337,8 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText="0 votes"
@@ -2333,6 +2390,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -2371,6 +2429,8 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText="0 votes"
@@ -2422,6 +2482,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -2460,6 +2521,8 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             }
           }
           checked={false}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText="2 votes"
@@ -2511,6 +2574,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
@@ -2549,6 +2613,8 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
             }
           }
           checked={true}
+          maxSelections={1}
+          onMultiSelection={[Function]}
           onOptionSelected={[Function]}
           pollId="$mypoll"
           votesText="1 vote"
@@ -2600,6 +2666,7 @@ exports[`MPollBody renders a poll with only non-local votes 1`] = `
         </LivePollOption>
         <div
           className="mx_MPollBody_popularityBackground"
+          onClick={[Function]}
         >
           <div
             className="mx_MPollBody_popularityAmount"
diff --git a/test/components/views/settings/__snapshots__/DevicesPanel-test.tsx.snap b/test/components/views/settings/__snapshots__/DevicesPanel-test.tsx.snap
index 96ec4a13bd1..1682c25dcaf 100644
--- a/test/components/views/settings/__snapshots__/DevicesPanel-test.tsx.snap
+++ b/test/components/views/settings/__snapshots__/DevicesPanel-test.tsx.snap
@@ -215,7 +215,7 @@ exports[`<DevicesPanel /> renders device panel with devices 1`] = `
         class="mx_SelectableDeviceTile"
       >
         <span
-          class="mx_Checkbox mx_SelectableDeviceTile_checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+          class="mx_SelectableDeviceTile_checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
         >
           <input
             data-testid="device-tile-checkbox-device_2"
@@ -301,7 +301,7 @@ exports[`<DevicesPanel /> renders device panel with devices 1`] = `
         class="mx_SelectableDeviceTile"
       >
         <span
-          class="mx_Checkbox mx_SelectableDeviceTile_checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+          class="mx_SelectableDeviceTile_checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
         >
           <input
             data-testid="device-tile-checkbox-device_3"
diff --git a/test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
index 87dc6c0da46..39c17607ed6 100644
--- a/test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/SelectableDeviceTile-test.tsx.snap
@@ -15,7 +15,7 @@ exports[`<SelectableDeviceTile /> renders unselected device tile with checkbox 1
     class="mx_SelectableDeviceTile"
   >
     <span
-      class="mx_Checkbox mx_SelectableDeviceTile_checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
+      class="mx_SelectableDeviceTile_checkbox mx_Checkbox mx_Checkbox_hasKind mx_Checkbox_kind_solid"
     >
       <input
         data-testid="device-tile-checkbox-my-device"