diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua
index d656f1c91..917e2ebff 100644
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -725,9 +725,15 @@ core.register_chatcommand("shutdown", {
 		core.log("action", name .. " shuts down server")
 		core.request_shutdown()
 		core.chat_send_all("*** Server shutting down (operator request).")
+		for _,player in ipairs(minetest.get_connected_players()) do
+			local name = player:get_player_name()
+			core.kick_player(name, "Server shutting down.")
+		end
 	end,
 })
 
+})
+
 core.register_chatcommand("ban", {
 	params = "<name>",
 	description = "Ban IP of player",