diff --git a/frontend/lib/views/chat/chat_view.dart b/frontend/lib/views/chat/chat_view.dart
index 44b93a66d..fe28d9ae7 100644
--- a/frontend/lib/views/chat/chat_view.dart
+++ b/frontend/lib/views/chat/chat_view.dart
@@ -83,6 +83,7 @@ class _ChatViewState extends State<ChatView> {
                   return UserMessageTile(message: chat.message);
                 } else {
                   return AgentMessageTile(
+                    key: ValueKey(chat.id),
                     chat: chat,
                     onArtifactsButtonPressed: () {
                       // TODO: Create an actual artifact object