diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js
index 69aee9d981..1f3764e65d 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@ -103,7 +103,7 @@ class Option extends React.PureComponent {
         </label>
 
         <div className='poll__cancel'>
-          <IconButton disabled={index < pollLimits.min_options} title={intl.formatMessage(messages.remove_option)} icon='times' onClick={this.handleOptionRemove} />
+          <IconButton disabled={index < pollMinOptions} title={intl.formatMessage(messages.remove_option)} icon='times' onClick={this.handleOptionRemove} />
         </div>
       </li>
     );
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index dc72be14d0..6508bfdb78 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -133,6 +133,6 @@ export const languages = initialState?.languages;
 export const maxChars = (initialState && initialState.max_toot_chars) || 500;
 
 // CatCatNya~ specific settings
-export const pollLimits = (initialState && initialState.poll_limits);
+export const pollMinOptions = (initialState && initialState.poll_limits && initialState.poll_limits.min_options) || 2;
 
 export default initialState;
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 82bc64a8ba..4d4aaf112f 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -95,7 +95,7 @@ const initialState = ImmutableMap({
 });
 
 const initialPoll = ImmutableMap({
-  options: ImmutableList(new Array(pollLimits.min_options).fill('')),
+  options: ImmutableList(new Array(pollMinOptions).fill('')),
   expires_in: 24 * 3600,
   multiple: false,
 });