diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 8b5e131511..3275e16049 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -504,7 +504,7 @@ export default function compose(state = initialState, action) {
       }
 
       if (action.status.get('poll')) {
-        let options = ImmutableList(action.status.get('poll').options.map(x => x.title));
+        let options = action.status.getIn(['poll', 'options']).map(x => x.get('title'));
         if (options.size < action.maxOptions) {
           options = options.push('');
         }
@@ -538,7 +538,7 @@ export default function compose(state = initialState, action) {
       }
 
       if (action.status.get('poll')) {
-        let options = ImmutableList(action.status.get('poll').options.map(x => x.title));
+        let options = action.status.getIn(['poll', 'options']).map(x => x.get('title'));
         if (options.size < action.maxOptions) {
           options = options.push('');
         }