diff --git a/Nasal/multiplayer.nas b/Nasal/multiplayer.nas
index 803df0b39..7b02e3e70 100644
--- a/Nasal/multiplayer.nas
+++ b/Nasal/multiplayer.nas
@@ -64,16 +64,15 @@ var echo_message = func(msg, callsign)
   }
 
   # Add the chat to the chat history.
-  var lchat = getprop("/sim/multiplay/chat-history");
+  var lchat = getprop("/sim/multiplay/chat-history") or "";
 
-  if (lchat == nil)
+  if (lchat)
   {
-    setprop("/sim/multiplay/chat-history", msg);
-  }
-  else
-  {
-    setprop("/sim/multiplay/chat-history", lchat ~ "\n" ~ msg);
+    lchat = string.trim(lchat, 0, string.isxspace);
+    msg = lchat ~ "\n" ~ msg;
   }
+
+  setprop("/sim/multiplay/chat-history", msg);
 }
 
 settimer(func {