diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs
index 4fc04e6..e213ba8 100644
--- a/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs
+++ b/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs
@@ -3604,8 +3604,13 @@ public class Player : Actor, IMessageConsumer, IUpdateable
 
         System.Threading.Tasks.Task.Delay(3).Wait();
         RevealActorsToPlayer();
+        
         if (!_motdSent && LoginServer.LoginServerConfig.Instance.MotdEnabled)
+        {
+            if (GameServerConfig.Instance.MotdWhenWorldLoads)
+                _motdSent = true;
             InGameClient.BnetClient.SendMotd();
+        }
         //
     }
 
diff --git a/src/DiIiS-NA/D3-GameServer/GameServerConfig.cs b/src/DiIiS-NA/D3-GameServer/GameServerConfig.cs
index 095569e..bce9504 100644
--- a/src/DiIiS-NA/D3-GameServer/GameServerConfig.cs
+++ b/src/DiIiS-NA/D3-GameServer/GameServerConfig.cs
@@ -66,6 +66,15 @@ namespace DiIiS_NA.GameServer
 			set => Set(nameof(AfkDisconnect), value);
 		}
 		
+		/// <summary>
+		/// Always send motd when world loads for player.
+		/// </summary>
+		public bool MotdWhenWorldLoads
+		{
+			get => GetBoolean(nameof(MotdWhenWorldLoads), true);
+			set => Set(nameof(MotdWhenWorldLoads), value);
+		}
+		
 		#region Game Mods
 
 		/// <summary>