diff --git a/bigbluebutton-html5/imports/ui/components/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
index b9f0ad304c10f81a59a288455553cf40e08d1b5a..c446d92e7b44c8b2797faef1118b1bc60f53f8d0 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
@@ -112,16 +112,16 @@ class Poll extends Component {
     const { intl } = this.props;
     const items = [];
 
-    for (let i = 0; i < MAX_CUSTOM_FIELDS; i++) {
-      items.push(<input
+    items = _.range(1, MAX_CUSTOM_FIELDS + 1).map((ele, index) => (
+      <input
         key={_.uniqueId('custom-poll-')}
         placeholder={intl.formatMessage(intlMessages.customPlaceholder)}
         className={styles.input}
-        ref={(node) => { this[`pollInput${i}`] = node; }}
-        onChange={() => this.validateInputField(this[`pollInput${i}`])}
-        data-index={i}
-      />);
-    }
+        ref={(node) => { this[`pollInput${index}`] = node; }}
+        onChange={() => this.validateInputField(this[`pollInput${index}`])}
+        data-index={index}
+      />
+    ));
 
     return items;
   }