diff --git a/app/javascript/mastodon/api_types/polls.ts b/app/javascript/mastodon/api_types/polls.ts
index 891a2faba7..1ff2a6a5cb 100644
--- a/app/javascript/mastodon/api_types/polls.ts
+++ b/app/javascript/mastodon/api_types/polls.ts
@@ -9,7 +9,7 @@ export interface ApiPollOptionJSON {
 
 export interface ApiPollJSON {
   id: string;
-  expires_at: string;
+  expires_at: string | null;
   expired: boolean;
   multiple: boolean;
   votes_count: number;
diff --git a/app/javascript/mastodon/components/poll.tsx b/app/javascript/mastodon/components/poll.tsx
index c77ce8bcee..443022c003 100644
--- a/app/javascript/mastodon/components/poll.tsx
+++ b/app/javascript/mastodon/components/poll.tsx
@@ -36,7 +36,7 @@ const messages = defineMessages({
 });
 
 const isPollExpired = (expiresAt: Model.Poll['expires_at']) =>
-  new Date(expiresAt).getTime() < Date.now();
+  expiresAt !== null && new Date(expiresAt).getTime() < Date.now();
 
 interface PollProps {
   pollId: string;
@@ -64,7 +64,7 @@ export const Poll: React.FC<PollProps> = ({ pollId, disabled, status }) => {
     return poll.expired || isPollExpired(poll.expires_at);
   }, [poll]);
   const timeRemaining = useMemo(() => {
-    if (!poll) {
+    if (!poll?.expires_at) {
       return null;
     }
     if (expired) {
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 166c3e3e3a..3c02db0836 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -75,8 +75,8 @@ function getStatusResultFunction(
     status: statusBase.withMutations(map => {
       map.set('reblog', statusReblog);
       map.set('account', accountBase);
-      map.set('matched_filters', filtered);
-      map.set('matched_media_filters', mediaFiltered);
+      map.set('matched_filters', filtered ? filtered.toJS() : false);
+      map.set('matched_media_filters', mediaFiltered ? mediaFiltered.toJS() : false);
     }),
     loadingState: statusBase.get('isLoading') ? 'loading' : 'complete'
   };