diff --git a/CHANGELOG.md b/CHANGELOG.md
index 763e591..38383f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Essentials 1.5.1
+* Fixes
+    - Fixed crash if the MOTD field is empty
+
 # Essentials 1.5
 * Features
     - Added MOTD
diff --git a/Essentials/EssentialsPlugin.cs b/Essentials/EssentialsPlugin.cs
index 3b78aa1..67fcdbb 100644
--- a/Essentials/EssentialsPlugin.cs
+++ b/Essentials/EssentialsPlugin.cs
@@ -17,7 +17,7 @@
 
 namespace Essentials
 {
-    [Plugin("Essentials", "1.5", "cbfdd6ab-4cda-4544-a201-f73efa3d46c0")]
+    [Plugin("Essentials", "1.5.1", "cbfdd6ab-4cda-4544-a201-f73efa3d46c0")]
     public class EssentialsPlugin : TorchPluginBase, IWpfPlugin
     {
         public EssentialsConfig Config => _config?.Data;
@@ -59,7 +59,7 @@ private void MotdOnce(MyEntity obj)
             if (obj is MyCharacter character)
             {
                 var id = character.ControllerInfo?.ControllingIdentityId ?? 0;
-                if (_motdOnce.Contains(id))
+                if (string.IsNullOrEmpty(Config.Motd) || _motdOnce.Contains(id))
                     return;
 
                 Torch.Multiplayer.SendMessage(Config.Motd, "MOTD", id);