diff --git a/entities.lua b/entities.lua
index b7b0dfe..cf60361 100644
--- a/entities.lua
+++ b/entities.lua
@@ -63,6 +63,9 @@ xp_redo.update_rank_entity = function(player, rank)
 		return
 	end
 
+	local state = player:get_meta():get(xp_redo.HUD_DISPLAY_STATE_NAME)
+	if state == "off" then return end
+
 	local playername = player:get_player_name()
 	local data = player_data[playername]
 
diff --git a/hud.lua b/hud.lua
index a44f285..e38dc3e 100644
--- a/hud.lua
+++ b/hud.lua
@@ -132,6 +132,7 @@ minetest.register_chatcommand("xp_hud", {
 			setup_hud(player)
 		elseif param == "off" then
 			remove_hud(player)
+			xp_redo.remove_rank_entity(player)
 		else
 			return true, "Usage: xp_hud on|off"
 		end