diff --git a/bigbluebutton-html5/imports/ui/components/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
index 1543811cc17addf8c08dffcc81a9e04b54572030..a5606b81cffd15b5331ddb31c4642a2d65d5ceb6 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
@@ -243,8 +243,24 @@ class Poll extends Component {
     this.setState({ question: validateInput(e.target.value), error: clearError ? null : error });
   }
 
+  setOptListLength(len) {
+    const { optList } = this.state;
+    len = len > MAX_CUSTOM_FIELDS ? MAX_CUSTOM_FIELDS : len;
+    let diff = len - optList.length;
+    if(diff > 0) {
+      while(diff--) {
+        this.handleAddOption();
+      }
+    } else {
+      while(diff++) {
+        this.handleRemoveOption();
+      }
+    }
+  }
+
   pushToCustomPollValues(text) {
     const lines = text.split('\n');
+    this.setOptListLength(lines.length);
     for (let i = 0; i < MAX_CUSTOM_FIELDS; i += 1) {
       let line = '';
       if (i < lines.length) {