diff --git a/init.lua b/init.lua
index 6e64e89..3d30f86 100644
--- a/init.lua
+++ b/init.lua
@@ -22,3 +22,10 @@ dofile(modpath.."/pages/creative.lua")
 dofile(modpath.."/pages/player.lua")
 dofile(modpath.."/pages/doc.lua")
 dofile(modpath.."/pages/awards.lua")
+
+-- Cleanup inventories
+minetest.register_on_leaveplayer(function(player)
+	local player_name = player:get_player_name()
+	minetest.remove_detached_inventory(player_name.."_crafting_inv")
+	minetest.remove_detached_inventory(player_name.."_trash_inv")
+end)
diff --git a/pages/creative.lua b/pages/creative.lua
index 18a822a..1d5fdee 100644
--- a/pages/creative.lua
+++ b/pages/creative.lua
@@ -287,8 +287,3 @@ smart_inventory.register_page({
 	smartfs_callback = creative_callback,
 	sequence = 15
 })
-
-minetest.register_on_leaveplayer(function(player)
-	local invname = player:get_player_name().."_trash_inv"
-	minetest.remove_detached_inventory(invname)
-end)