diff --git a/mods/beds/functions.lua b/mods/beds/functions.lua
index c3e2a2c969..63865e9c9c 100644
--- a/mods/beds/functions.lua
+++ b/mods/beds/functions.lua
@@ -254,12 +254,18 @@ if enable_respawn then
 	end)
 end
 
+minetest.register_on_joinplayer(function(player)
+	update_formspecs(false)
+end)
+
 minetest.register_on_leaveplayer(function(player)
 	local name = player:get_player_name()
 	lay_down(player, nil, nil, false, true)
 	beds.player[name] = nil
 	if check_in_beds() then
 		schedule_update()
+	else
+		update_formspecs(false)
 	end
 end)