diff --git a/app/MindWork AI Studio/Pages/Chat.razor.cs b/app/MindWork AI Studio/Pages/Chat.razor.cs
index bba11f9e..db841df0 100644
--- a/app/MindWork AI Studio/Pages/Chat.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Chat.razor.cs	
@@ -84,9 +84,12 @@ public partial class Chat : MSGComponentBase, IAsyncDisposable
                         };
                     }
                 }
-                
-                this.autoSaveEnabled = true;
-                this.mustStoreChat = true;
+
+                if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is WorkspaceStorageBehavior.STORE_CHATS_AUTOMATICALLY)
+                {
+                    this.autoSaveEnabled = true;
+                    this.mustStoreChat = true;
+                }
             }
             
             if (this.SettingsManager.ConfigurationData.Chat.ShowLatestMessageAfterLoading)