diff --git a/zone/gm_commands/set/motd.cpp b/zone/gm_commands/set/motd.cpp
index 51ec7ca98..8d188ab48 100755
--- a/zone/gm_commands/set/motd.cpp
+++ b/zone/gm_commands/set/motd.cpp
@@ -17,7 +17,7 @@ void SetMOTD(Client *c, const Seperator *sep)
 
 	auto m = (ServerMotd_Struct *) pack->pBuffer;
 	strn0cpy(m->myname, c->GetName(), sizeof(m->myname));
-	strn0cpy(m->motd, message.c_str(), sizeof(m->motd));
+	strn0cpy(m->motd, !message.empty() ? message.c_str() : "", sizeof(m->motd));
 
 	worldserver.SendPacket(pack);
 	safe_delete(pack);