diff --git a/package.json b/package.json
index de483a50..4a894549 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@d-id/client-sdk",
     "private": false,
-    "version": "1.1.8",
+    "version": "1.1.9",
     "type": "module",
     "description": "d-id client sdk",
     "repository": {
diff --git a/src/services/agent-manager/index.ts b/src/services/agent-manager/index.ts
index 9be4f548..aea54edf 100644
--- a/src/services/agent-manager/index.ts
+++ b/src/services/agent-manager/index.ts
@@ -141,6 +141,12 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
 
         firstConnection = false;
 
+        analytics.enrich({
+            chatId: chat?.id,
+            streamId: streamingManager?.streamId,
+            mode: items.chatMode,
+        });
+
         changeMode(chat?.chat_mode ?? options.mode ?? ChatMode.Functional);
     }
 
@@ -180,12 +186,7 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
 
             analytics.track('agent-chat', {
                 event: 'connect',
-                chatId: items.chat?.id,
-                agentId: agentEntity.id,
                 mode: items.chatMode,
-                access: agentEntity.access,
-                name: agentEntity.preview_name,
-                ...(agentEntity.access === 'public' ? { from: 'agent-template' } : {}),
             });
         },
         async reconnect() {
@@ -194,12 +195,7 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
 
             analytics.track('agent-chat', {
                 event: 'reconnect',
-                chatId: items.chat?.id,
-                agentId: agentEntity.id,
                 mode: items.chatMode,
-                access: agentEntity.access,
-                name: agentEntity.preview_name,
-                ...(agentEntity.access === 'public' ? { from: 'agent-template' } : {}),
             });
         },
         async disconnect() {
@@ -207,12 +203,7 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
 
             analytics.track('agent-chat', {
                 event: 'disconnect',
-                chatId: items.chat?.id,
-                agentId: agentEntity.id,
                 mode: items.chatMode,
-                access: agentEntity.access,
-                name: agentEntity.preview_name,
-                ...(agentEntity.access === 'public' ? { from: 'agent-template' } : {}),
             });
         },
         async chat(userMessage: string) {
@@ -321,7 +312,6 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
 
                 analytics.track('agent-message-send', {
                     event: 'success',
-                    mode: items.chatMode,
                     messages: items.messages.length + 1,
                 });
 
@@ -330,7 +320,6 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
 
                     analytics.track('agent-message-received', {
                         latency: latencyTimestampTracker.get(true),
-                        mode: items.chatMode,
                         messages: items.messages.length,
                     });
                 }
@@ -343,7 +332,6 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
 
                 analytics.track('agent-message-send', {
                     event: 'error',
-                    mode: items.chatMode,
                     messages: items.messages.length,
                 });
 
@@ -365,7 +353,6 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
                 event: rateId ? 'update' : 'create',
                 thumb: score === 1 ? 'up' : 'down',
                 knowledge_id: agentEntity.knowledge?.id ?? '',
-                mode: items.chatMode,
                 matches,
                 score,
             });
@@ -391,7 +378,7 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
                 throw new Error('Chat is not initialized');
             }
 
-            analytics.track('agent-rate-delete', { type: 'text', chat_id: items.chat?.id, id, mode: items.chatMode });
+            analytics.track('agent-rate-delete', { type: 'text' });
 
             return agentsApi.deleteRating(agentEntity.id, items.chat.id, id);
         },
@@ -466,13 +453,8 @@ export async function createAgentManager(agent: string, options: AgentManagerOpt
 
             analytics.track('agent-video-interrupt', {
                 type: type || 'click',
-                stream_id: items.streamingManager?.streamId,
-                agent_id: agentEntity.id,
-                owner_id: agentEntity.owner_id,
                 video_duration_to_interrupt: interruptTimestampTracker.get(true),
                 message_duration_to_interrupt: latencyTimestampTracker.get(true),
-                chat_id: items.chat?.id,
-                mode: items.chatMode,
             });
 
             lastMessage.interrupted = true;
diff --git a/src/services/chat/index.ts b/src/services/chat/index.ts
index a767fa0e..d7ae33ad 100644
--- a/src/services/chat/index.ts
+++ b/src/services/chat/index.ts
@@ -23,11 +23,7 @@ export async function createChat(
             analytics.track('agent-chat', {
                 event: 'created',
                 chatId: chat.id,
-                agentId: agent.id,
                 mode: chatMode,
-                access: agent.access,
-                name: agent.preview_name,
-                ...(agent.access === 'public' ? { from: 'agent-template' } : {}),
             });
         }
 
diff --git a/src/utils/analytics.ts b/src/utils/analytics.ts
index d90a4449..562a5a67 100644
--- a/src/utils/analytics.ts
+++ b/src/utils/analytics.ts
@@ -50,6 +50,10 @@ export function getAgentInfo(agent: Agent) {
         starterQuestionsCount: agent.knowledge?.starter_message?.length,
         topicsToAvoid: promptCustomization?.topics_to_avoid,
         maxResponseLength: promptCustomization?.max_response_length,
+        agentId: agent.id,
+        access: agent.access,
+        name: agent.preview_name,
+        ...(agent.access === 'public' ? { from: 'agent-template' } : {}),
     };
 }
 export const sumFunc = (numbers: number[]) => numbers.reduce((total, aNumber) => total + aNumber, 0);