diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 20d8bde..4e25f43 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -146,6 +146,7 @@ const Chat = {
             this._updateResetBtn();
             this._hideTyping();
             this.addMessage('assistant', data.reply);
+            this._highlightUI(data.reply);
         } catch (err) {
             this._hideTyping();
             const msg = err.detail || err.message || 'Etwas ist schiefgelaufen. Bitte versuche es erneut.';
@@ -178,7 +179,6 @@ const Chat = {
             container.scrollTop = container.scrollHeight;
         } else {
             bubble.scrollIntoView({ behavior: 'smooth', block: 'start' });
-            this._highlightUI(text);
         }
     },