diff --git a/Presentation/HushianWebApp/Pages/Chat.razor b/Presentation/HushianWebApp/Pages/Chat.razor
index 794cdd3..179ebb3 100644
--- a/Presentation/HushianWebApp/Pages/Chat.razor
+++ b/Presentation/HushianWebApp/Pages/Chat.razor
@@ -15,6 +15,8 @@
 @inject ILocalStorageService localStorageService;
 @inject HttpClient _Http;
 @inject NavigationManager nav
+@implements IAsyncDisposable
+
 <ConfirmDialog @ref="dialog" />
 <Modal @ref="modal" IsVerticallyCentered="true" IsScrollable="true" />
 <PageTitle>گفتمان</PageTitle>
@@ -782,7 +784,14 @@
         SelectedImagePreview = null;
         return Task.CompletedTask;
     }
-   
+    public async ValueTask DisposeAsync()
+    {
+        if (hubConnection is not null)
+        {
+            await hubConnection.StopAsync();
+            await hubConnection.DisposeAsync();
+        }
+    }
 }
 
 <style>
diff --git a/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor b/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
index 13c6605..517c8c7 100644
--- a/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
+++ b/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
@@ -13,7 +13,7 @@
 {
     <PageTitle>گفتگو با @CompanyInfo?.FullName</PageTitle>
 }
-
+@implements IAsyncDisposable
 @inject NavigationManager NavigationManager
 @inject ChatService ChatService
 @inject ILocalStorageService localStorageService;
@@ -727,6 +727,14 @@
         }
         return $"image_{DateTimeOffset.Now.ToUnixTimeSeconds()}{ext}";
     }
+    public async ValueTask DisposeAsync()
+    {
+        if (hubConnection is not null)
+        {
+            await hubConnection.StopAsync();
+            await hubConnection.DisposeAsync();
+        }
+    }
 }
 <style>
     .chat-bubble {