diff --git a/src/channel_state.ts b/src/channel_state.ts
index 0e573986c..34023b9d1 100644
--- a/src/channel_state.ts
+++ b/src/channel_state.ts
@@ -500,7 +500,7 @@ export class ChannelState<StreamChatGenerics extends ExtendableGenerics = Defaul
     if (message.poll_id !== pollVote.poll_id) return;
 
     const updatedPoll = { ...poll };
-    let ownVotes = [...(message.poll.own_votes || [])];
+    let ownVotes = [...(message.poll?.own_votes || [])];
 
     if (pollVote.user_id === this._channel.getClient().userID) {
       if (pollVote.option_id && poll.enforce_unique_vote) {
@@ -527,7 +527,7 @@ export class ChannelState<StreamChatGenerics extends ExtendableGenerics = Defaul
     if (message.poll_id !== pollVote.poll_id) return;
 
     const updatedPoll = { ...poll };
-    const ownVotes = [...(message.poll.own_votes || [])];
+    const ownVotes = [...(message.poll?.own_votes || [])];
 
     if (pollVote.user_id === this._channel.getClient().userID) {
       ownVotes.push(pollVote);
@@ -550,7 +550,7 @@ export class ChannelState<StreamChatGenerics extends ExtendableGenerics = Defaul
     if (message.poll_id !== pollVote.poll_id) return;
 
     const updatedPoll = { ...poll };
-    const ownVotes = [...(message.poll.own_votes || [])];
+    const ownVotes = [...(message.poll?.own_votes || [])];
     if (pollVote.user_id === this._channel.getClient().userID) {
       const index = ownVotes.findIndex((vote) => vote.option_id === pollVote.option_id);
       if (index > -1) {
diff --git a/src/types.ts b/src/types.ts
index 59b17d378..9be9a093d 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -627,7 +627,6 @@ export type MessageResponse<
 export type MessageResponseBase<
   StreamChatGenerics extends ExtendableGenerics = DefaultGenerics
 > = MessageBase<StreamChatGenerics> & {
-  poll: PollResponse<StreamChatGenerics>;
   type: MessageLabel;
   args?: string;
   before_message_send_failed?: boolean;
@@ -649,6 +648,7 @@ export type MessageResponseBase<
   pin_expires?: string | null;
   pinned_at?: string | null;
   pinned_by?: UserResponse<StreamChatGenerics> | null;
+  poll?: PollResponse<StreamChatGenerics>;
   reaction_counts?: { [key: string]: number } | null;
   reaction_scores?: { [key: string]: number } | null;
   reply_count?: number;