diff --git a/app/MindWork AI Studio/Components/ChatComponent.razor.cs b/app/MindWork AI Studio/Components/ChatComponent.razor.cs
index 5ca0ebdd..f21aeb48 100644
--- a/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
+++ b/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
@@ -692,6 +692,7 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
 
     public async ValueTask DisposeAsync()
     {
+        this.MessageBus.Unregister(this);
         if(this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is WorkspaceStorageBehavior.STORE_CHATS_AUTOMATICALLY)
         {
             await this.SaveThread();
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.27.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.27.md
index 13aac2b0..eb58ebbd 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.27.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.27.md	
@@ -1,4 +1,5 @@
 # v0.9.27, build 202 (2025-01-xx xx:xx UTC)
 - Improved the inner content scrolling to use the entire space available.
 - Fixed the hostname validation message for ERI v1 data sources.
+- Fixed a memory leak in the chat component.
 - Removed the "send to" button from the ERI server assistant, since it is not supported. 
\ No newline at end of file