diff --git a/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-assistent-message/orama-chat-assistent-message.tsx b/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-assistent-message/orama-chat-assistent-message.tsx
index 65ae4e07..f5bd54ec 100644
--- a/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-assistent-message/orama-chat-assistent-message.tsx
+++ b/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-assistent-message/orama-chat-assistent-message.tsx
@@ -4,7 +4,7 @@ import type { TChatMessage } from '../../../../context/chatContext'
 @Component({
   tag: 'orama-chat-assistent-message',
   styleUrl: 'orama-chat-assistent-message.scss',
-  shadow: true
+  shadow: true,
 })
 export class OramaChatAssistentMessage {
   @Prop() message: TChatMessage
diff --git a/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-messages-container.tsx b/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-messages-container.tsx
index 3beee082..c5a7fe62 100644
--- a/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-messages-container.tsx
+++ b/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-messages-container.tsx
@@ -4,22 +4,21 @@ import { chatContext } from '../../../context/chatContext'
 @Component({
   tag: 'orama-chat-messages-container',
   styleUrl: 'orama-chat-messages-container.scss',
-  shadow: true
+  shadow: true,
 })
 export class OramaChatMessagesContainer {
   render() {
-    console.log()
     return (
       <Host>
         <div class="messages-container">
           {chatContext.messages.map((message, index) =>
             message.role === 'user' ? (
               // biome-ignore lint/suspicious/noArrayIndexKey: There is not other key available form SDK right now
-              <orama-chat-user-message key={index} message={message} />
+              <orama-chat-user-message key={index} message={{ ...message }} />
             ) : (
               // biome-ignore lint/suspicious/noArrayIndexKey: There is not other key available form SDK right now
-              <orama-chat-assistent-message key={index} message={message} />
-            )
+              <orama-chat-assistent-message key={index} message={{ ...message }} />
+            ),
           )}
         </div>
       </Host>
diff --git a/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-user-message/orama-chat-user-message.tsx b/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-user-message/orama-chat-user-message.tsx
index bc39c1d7..ed61fc9d 100644
--- a/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-user-message/orama-chat-user-message.tsx
+++ b/packages/ui-stencil/src/components/internal/orama-chat-messages-container/orama-chat-user-message/orama-chat-user-message.tsx
@@ -4,7 +4,7 @@ import type { TChatMessage } from '../../../../context/chatContext'
 @Component({
   tag: 'orama-chat-user-message',
   styleUrl: 'orama-chat-user-message.scss',
-  shadow: true
+  shadow: true,
 })
 export class OramaChatUserMessage {
   @Prop() message: TChatMessage
diff --git a/packages/ui-stencil/src/services/ChatService.ts b/packages/ui-stencil/src/services/ChatService.ts
index 66166c73..54dc466e 100644
--- a/packages/ui-stencil/src/services/ChatService.ts
+++ b/packages/ui-stencil/src/services/ChatService.ts
@@ -26,8 +26,8 @@ export class ChatService {
           onMessageLoading: (loading) => (chatContext.isLoading = loading),
           onSourceChange: (sources) => {
             console.log(sources)
-          }
-        }
+          },
+        },
       })
     }