diff --git a/modules/chat.py b/modules/chat.py
index 96d36ba5..a24a5be1 100644
--- a/modules/chat.py
+++ b/modules/chat.py
@@ -825,6 +825,12 @@ def chatbot_wrapper(text, state, regenerate=False, _continue=False, loading_mess
 
         # Extract the reply
         if state['mode'] in ['chat', 'chat-instruct']:
+            reply = reply.lstrip()
+            if reply.startswith(state['name2'] + ':'):
+                reply = reply[len(state['name2'] + ':'):]
+            elif reply.startswith(state['name1'] + ':'):
+                reply = reply[len(state['name1'] + ':'):]
+
             visible_reply = re.sub("(<USER>|<user>|{{user}})", state['name1'], reply)
         else:
             visible_reply = reply