diff --git a/src/channel.ts b/src/channel.ts
index 4eb7a15e6..fb3b13147 100644
--- a/src/channel.ts
+++ b/src/channel.ts
@@ -796,12 +796,12 @@ export class Channel<StreamChatGenerics extends ExtendableGenerics = DefaultGene
    * @param state - The new state of the AI process (e.g., thinking, generating).
    * @param options - Optional parameters, such as `ai_message`, to include additional details in the event.
    */
-  async updateAIState(messageId: string, state: AIState, options?: { ai_message: string }) {
+  async updateAIState(messageId: string, state: AIState, options: { ai_message: string } = {}) {
     await this.sendEvent({
+      ...options,
       type: 'ai_indicator.update',
       message_id: messageId,
       ai_state: state,
-      ...(options || {}),
     } as Event<StreamChatGenerics>);
   }
 
diff --git a/src/types.ts b/src/types.ts
index e0d3d7214..8667f6cca 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -3547,4 +3547,4 @@ export type GetUserModerationReportOptions = {
   include_user_mutes?: boolean;
 };
 
-export type AIState = 'AI_STATE_ERROR|AI_STATE_CHECKING_SOURCES|AI_STATE_THINKING|AI_STATE_GENERATING' | string;
+export type AIState = 'AI_STATE_ERROR' | 'AI_STATE_CHECKING_SOURCES' | 'AI_STATE_THINKING' | 'AI_STATE_GENERATING' | (string & {});