diff --git a/react/features/polls/components/native/PollCreate.js b/react/features/polls/components/native/PollCreate.js
index e08010b73..d13bacad2 100644
--- a/react/features/polls/components/native/PollCreate.js
+++ b/react/features/polls/components/native/PollCreate.js
@@ -7,7 +7,7 @@ import { Button } from 'react-native-paper';
 import { Icon, IconClose } from '../../../base/icons';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 import { BUTTON_MODES } from '../../../chat/constants';
-import { CHAR_LIMIT } from '../../constants';
+import { ANSWERS_LIMIT, CHAR_LIMIT } from '../../constants';
 import AbstractPollCreate from '../AbstractPollCreate';
 import type { AbstractProps } from '../AbstractPollCreate';
 
@@ -151,6 +151,7 @@ const PollCreate = (props: AbstractProps) => {
                 <View style = { chatStyles.pollCreateButtonsContainer }>
                     <Button
                         color = { BaseTheme.palette.action02 }
+                        disabled = { answers.length >= ANSWERS_LIMIT }
                         mode = { BUTTON_MODES.CONTAINED }
                         onPress = { () => {
                             // adding and answer
diff --git a/react/features/polls/components/web/PollCreate.js b/react/features/polls/components/web/PollCreate.js
index 16e1612fa..cafab658d 100644
--- a/react/features/polls/components/web/PollCreate.js
+++ b/react/features/polls/components/web/PollCreate.js
@@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { Icon, IconMenu } from '../../../base/icons';
 import { Tooltip } from '../../../base/tooltip';
-import { CHAR_LIMIT } from '../../constants';
+import { ANSWERS_LIMIT, CHAR_LIMIT } from '../../constants';
 import AbstractPollCreate from '../AbstractPollCreate';
 import type { AbstractProps } from '../AbstractPollCreate';
 
@@ -237,6 +237,7 @@ const PollCreate = (props: AbstractProps) => {
                 <button
                     aria-label = { 'Add option' }
                     className = 'poll-button poll-button-secondary'
+                    disabled = { answers.length >= ANSWERS_LIMIT }
                     onClick = { () => {
                         addAnswer();
                         requestFocus(answers.length);
diff --git a/react/features/polls/constants.js b/react/features/polls/constants.js
index a47da19ef..effbfc727 100644
--- a/react/features/polls/constants.js
+++ b/react/features/polls/constants.js
@@ -4,4 +4,5 @@ export const COMMAND_NEW_POLL = 'new-poll';
 export const COMMAND_ANSWER_POLL = 'answer-poll';
 export const COMMAND_OLD_POLLS = 'old-polls';
 
-export const CHAR_LIMIT = 1000;
+export const CHAR_LIMIT = 500;
+export const ANSWERS_LIMIT = 255;