diff --git a/assistant.py b/assistant.py
index 6c2835e..08e0db0 100755
--- a/assistant.py
+++ b/assistant.py
@@ -179,12 +179,15 @@ def chat2(args, user_input, stream=True):
     if parse_commands(user_input):
         result = ''
     elif args.reflect:
+        print('assistant: ', end='')
         result = reflection_mode(user_input, stream)
     else:
+        print('assistant: ', end='')
         result = chat(user_input, stream)
 
-    conversation += 'user: ' + user_input + '\n'
-    conversation += 'assistant: ' + result + '\n'
+    if result != '':
+        conversation += 'user: ' + user_input + '\n'
+        conversation += 'assistant: ' + result + '\n'
     return result
 
 def highlightify_text(full_text):