diff --git a/app/soapbox/__fixtures__/status-with-poll.json b/app/soapbox/__fixtures__/status-with-poll.json
new file mode 100644
index 000000000..9dfd90d7e
--- /dev/null
+++ b/app/soapbox/__fixtures__/status-with-poll.json
@@ -0,0 +1,201 @@
+{
+  "account": {
+    "acct": "alex",
+    "avatar": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png",
+    "avatar_static": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png",
+    "bot": false,
+    "created_at": "2020-01-08T01:25:43.000Z",
+    "display_name": "Alex Gleason",
+    "emojis": [],
+    "fields": [
+      {
+        "name": "Website",
+        "value": "<a href=\"https://alexgleason.me\" rel=\"ugc\">https://alexgleason.me</a>"
+      },
+      {
+        "name": "Soapbox",
+        "value": "<a href=\"https://soapbox.pub\" rel=\"ugc\">https://soapbox.pub</a>"
+      },
+      {
+        "name": "Email",
+        "value": "alex@alexgleason.me"
+      },
+      {
+        "name": "Gender identity",
+        "value": "Soyboy"
+      },
+      {
+        "name": "Donate (PayPal)",
+        "value": "<a href=\"https://paypal.me/gleasonator\" rel=\"ugc\">https://paypal.me/gleasonator</a>"
+      },
+      {
+        "name": "$BTC",
+        "value": "bc1q9cx35adpm73aq2fw40ye6ts8hfxqzjr5unwg0n"
+      },
+      {
+        "name": "$ETH",
+        "value": "0xAc9aB5Fc04Dc1cB1789Af75b523Bd23C70B2D717"
+      },
+      {
+        "name": "$DOGE",
+        "value": "D5zVZs6jrRakaPVGiErkQiHt9sayzm6V5D"
+      },
+      {
+        "name": "$XMR",
+        "value": "45JDCLrjJ4bgVUSbbs2yjy9m5Mf4VLPW8fG7jw9sq5u69rXZZopQogZNeyYkMBnXpkaip4p4QwaaJNhdTotPa9g44DBCzdK"
+      }
+    ],
+    "followers_count": 2390,
+    "following_count": 1574,
+    "fqn": "alex@gleasonator.com",
+    "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png",
+    "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png",
+    "id": "9v5bmRalQvjOy0ECcC",
+    "last_status_at": "2022-02-23T17:54:41",
+    "locked": false,
+    "note": "I create Fediverse software that empowers people online.<br/><br/>I&#39;m vegan btw<br/><br/>Note: If you have a question for me, please tag me publicly. This gives the opportunity for others to chime in, and bystanders to learn.",
+    "pleroma": {
+      "accepts_chat_messages": true,
+      "also_known_as": [
+        "https://mitra.social/users/alex"
+      ],
+      "ap_id": "https://gleasonator.com/users/alex",
+      "background_image": null,
+      "birthday": "1993-07-03",
+      "favicon": "https://gleasonator.com/favicon.png",
+      "hide_favorites": true,
+      "hide_followers": false,
+      "hide_followers_count": false,
+      "hide_follows": false,
+      "hide_follows_count": false,
+      "is_admin": true,
+      "is_confirmed": true,
+      "is_moderator": false,
+      "is_suggested": true,
+      "relationship": {},
+      "skip_thread_containment": false,
+      "tags": []
+    },
+    "source": {
+      "fields": [
+        {
+          "name": "Website",
+          "value": "https://alexgleason.me"
+        },
+        {
+          "name": "Soapbox",
+          "value": "https://soapbox.pub"
+        },
+        {
+          "name": "Email",
+          "value": "alex@alexgleason.me"
+        },
+        {
+          "name": "Gender identity",
+          "value": "Soyboy"
+        },
+        {
+          "name": "Donate (PayPal)",
+          "value": "https://paypal.me/gleasonator"
+        },
+        {
+          "name": "$BTC",
+          "value": "bc1q9cx35adpm73aq2fw40ye6ts8hfxqzjr5unwg0n"
+        },
+        {
+          "name": "$ETH",
+          "value": "0xAc9aB5Fc04Dc1cB1789Af75b523Bd23C70B2D717"
+        },
+        {
+          "name": "$DOGE",
+          "value": "D5zVZs6jrRakaPVGiErkQiHt9sayzm6V5D"
+        },
+        {
+          "name": "$XMR",
+          "value": "45JDCLrjJ4bgVUSbbs2yjy9m5Mf4VLPW8fG7jw9sq5u69rXZZopQogZNeyYkMBnXpkaip4p4QwaaJNhdTotPa9g44DBCzdK"
+        }
+      ],
+      "note": "I create Fediverse software that empowers people online.\r\n\r\nI'm vegan btw\r\n\r\nNote: If you have a question for me, please tag me publicly. This gives the opportunity for others to chime in, and bystanders to learn.",
+      "pleroma": {
+        "actor_type": "Person",
+        "discoverable": false
+      },
+      "sensitive": false
+    },
+    "statuses_count": 23502,
+    "url": "https://gleasonator.com/users/alex",
+    "username": "alex"
+  },
+  "application": null,
+  "bookmarked": false,
+  "card": null,
+  "content": "<p>What is tolerance?</p>",
+  "created_at": "2020-03-23T19:33:06.000Z",
+  "emojis": [],
+  "favourited": false,
+  "favourites_count": 47,
+  "id": "103874034847713213",
+  "in_reply_to_account_id": null,
+  "in_reply_to_id": null,
+  "language": null,
+  "media_attachments": [],
+  "mentions": [],
+  "muted": false,
+  "pinned": true,
+  "pleroma": {
+    "content": {
+      "text/plain": "What is tolerance?"
+    },
+    "conversation_id": "3023268",
+    "direct_conversation_id": null,
+    "emoji_reactions": [
+      {
+        "count": 3,
+        "me": false,
+        "name": "❤️"
+      }
+    ],
+    "expires_at": null,
+    "in_reply_to_account_acct": null,
+    "local": true,
+    "parent_visible": false,
+    "pinned_at": "2021-11-23T01:38:44.000Z",
+    "quote": null,
+    "quote_url": null,
+    "quote_visible": false,
+    "spoiler_text": {
+      "text/plain": ""
+    },
+    "thread_muted": false
+  },
+  "poll": {
+    "emojis": [],
+    "expired": true,
+    "expires_at": "2020-03-24T19:33:06.000Z",
+    "id": "4930",
+    "multiple": false,
+    "options": [
+      {
+        "title": "Banning, censoring, and deplatforming anyone you disagree with",
+        "votes_count": 2
+      },
+      {
+        "title": "Promoting free speech, even for people and ideas you dislike",
+        "votes_count": 36
+      }
+    ],
+    "voters_count": 2,
+    "votes_count": 38
+  },
+  "reblog": null,
+  "reblogged": false,
+  "reblogs_count": 26,
+  "replies_count": 14,
+  "sensitive": false,
+  "spoiler_text": "",
+  "tags": [],
+  "text": null,
+  "uri": "https://gleasonator.com/users/alex/statuses/103874034847713213",
+  "url": "https://gleasonator.com/notice/103874034847713213",
+  "visibility": "public"
+}
diff --git a/app/soapbox/features/ui/util/pending_status_builder.js b/app/soapbox/features/ui/util/pending_status_builder.js
index 7812dbec6..5bcc095c6 100644
--- a/app/soapbox/features/ui/util/pending_status_builder.js
+++ b/app/soapbox/features/ui/util/pending_status_builder.js
@@ -14,6 +14,16 @@ const buildMentions = pendingStatus => {
   }
 };
 
+const buildPoll = pendingStatus => {
+  if (pendingStatus.hasIn(['poll', 'options'])) {
+    return pendingStatus.get('poll').update('options', options => {
+      return options.map(option => ImmutableMap({ title: option, votes_count: 0 }));
+    });
+  } else {
+    return null;
+  }
+};
+
 export const buildStatus = (state, pendingStatus, idempotencyKey) => {
   const me = state.get('me');
   const account = getAccount(state, me);
@@ -27,7 +37,7 @@ export const buildStatus = (state, pendingStatus, idempotencyKey) => {
     in_reply_to_id: inReplyToId,
     media_attachments: pendingStatus.get('media_ids', ImmutableList()).map(id => ImmutableMap({ id })),
     mentions: buildMentions(pendingStatus),
-    poll: pendingStatus.get('poll', null),
+    poll: buildPoll(pendingStatus),
     quote: pendingStatus.get('quote_id', null),
     sensitive: pendingStatus.get('sensitive', false),
     visibility: pendingStatus.get('visibility', 'public'),
diff --git a/app/soapbox/reducers/__tests__/statuses-test.js b/app/soapbox/reducers/__tests__/statuses-test.js
index 779c0e847..3a81f2004 100644
--- a/app/soapbox/reducers/__tests__/statuses-test.js
+++ b/app/soapbox/reducers/__tests__/statuses-test.js
@@ -107,6 +107,20 @@ describe('statuses reducer', () => {
       const result = reducer(undefined, action).getIn(['AGm7uC9DaAIGUa4KYK', 'contentHtml']);
       expect(result).toBe(expected);
     });
+
+    it('builds search_index', () => {
+      const status = require('soapbox/__fixtures__/status-with-poll.json');
+      const action = { type: STATUS_IMPORT, status };
+
+      const expected = `What is tolerance?
+
+Banning, censoring, and deplatforming anyone you disagree with
+
+Promoting free speech, even for people and ideas you dislike`;
+
+      const result = reducer(undefined, action).getIn(['103874034847713213', 'search_index']);
+      expect(result).toEqual(expected);
+    });
   });
 
   describe('STATUS_CREATE_REQUEST', () => {
diff --git a/app/soapbox/reducers/statuses.js b/app/soapbox/reducers/statuses.js
index d06b0acec..2f2b0ac7f 100644
--- a/app/soapbox/reducers/statuses.js
+++ b/app/soapbox/reducers/statuses.js
@@ -1,5 +1,5 @@
 import escapeTextContentForBrowser from 'escape-html';
-import { Map as ImmutableMap, fromJS } from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
 import emojify from 'soapbox/features/emoji/emoji';
 import { normalizeStatus } from 'soapbox/normalizers/status';
@@ -58,7 +58,7 @@ export const calculateStatus = (status, oldStatus, expandSpoilers = false) => {
     });
   } else {
     const spoilerText   = status.get('spoiler_text') || '';
-    const searchContent = ([spoilerText, status.get('content')].concat(status.getIn(['poll', 'options']) ? status.getIn(['poll', 'options']).map(option => option.get('title')) : [])).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+    const searchContent = (ImmutableList([spoilerText, status.get('content')]).concat(status.getIn(['poll', 'options'], ImmutableList()).map(option => option.get('title')))).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
     const emojiMap      = makeEmojiMap(status);
 
     return status.merge({