diff --git a/bigbluebutton-html5/imports/ui/components/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
index 84aa685b15056ec5fd9b7cdd2a637544a86bfafd..efd3c505a7b44f94a8d3a0850fa0546a5bcb1203 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
@@ -245,16 +245,17 @@ 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: '' });
-      optList.push(...emptyAddition);
+    let diff = len - optList.length;
+    if(diff > 0) {
+      while(diff--) {
+        this.handleAddOption();
+      }
     } else {
-      optList.splice(len);
+      while(diff++) {
+        this.handleRemoveOption();
+      }
     }
-    this.setState({ optList });
   }
 
   pushToCustomPollValues(text) {