diff --git a/core/deployment/src/main/resources/dev-ui/qwc-chat.js b/core/deployment/src/main/resources/dev-ui/qwc-chat.js
index 50d22e3cc..8479cddeb 100644
--- a/core/deployment/src/main/resources/dev-ui/qwc-chat.js
+++ b/core/deployment/src/main/resources/dev-ui/qwc-chat.js
@@ -66,6 +66,8 @@ a new system message, you have to use the New conversation button." style="width
         var systemMessage = this.shadowRoot.getElementById('system-message').value;
         if(systemMessage) {
             this._chatHistory = [{type: "System", message: systemMessage}];
+        } else {
+            this._chatHistory = [];
         }
         this.shadowRoot.getElementById('chat-button').disabled = null;
         this.jsonRpc.reset({systemMessage: systemMessage});
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
index f0672c2a4..cc6977e78 100644
--- a/docs/modules/ROOT/pages/includes/attributes.adoc
+++ b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,3 +1,3 @@
 :project-version: 0.6.0
 :langchain4j-version: 0.25.0
-:examples-dir: ./../examples/
+:examples-dir: ./../examples/
\ No newline at end of file