diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 5871b102b..658c70a26 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -59,9 +59,13 @@ end
 core.register_on_joinplayer(function(player)
 	local player_name = player:get_player_name()
 	if not core.is_singleplayer() then
-		local status = core.get_server_status(player_name, true)
-		if status and status ~= "" then
-			core.chat_send_player(player_name, status)
+	--	local status = core.get_server_status(player_name, true)
+	--	if status and status ~= "" then
+	--		core.chat_send_player(player_name, status)
+	--	end
+		local motd = core.settings:get("motd")
+		if motd ~= "" then
+			core.chat_send_player(player_name, "# Server: " .. motd)
 		end
 	end
 	core.send_join_message(player_name)