diff --git a/bigbluebutton-html5/imports/ui/components/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
index 5d28bcfe5b0a49f5727e72ec43569abe7d0926ad..84aa685b15056ec5fd9b7cdd2a637544a86bfafd 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
@@ -245,6 +245,8 @@ class Poll extends Component {
 
   setOptListLength(len) {
     const { optList } = this.state;
+
+    len = len > MAX_CUSTOM_FIELDS ? MAX_CUSTOM_FIELDS : len;
     const diff = len - optList.length;
     if (diff > 0) {
       const emptyAddition = Array(diff).fill({ val: '' });