diff --git a/mods/CORE/_mcl_autogroup/init.lua b/mods/CORE/_mcl_autogroup/init.lua
index be573b04e..4d8ab35b8 100644
--- a/mods/CORE/_mcl_autogroup/init.lua
+++ b/mods/CORE/_mcl_autogroup/init.lua
@@ -362,12 +362,6 @@ local function overwrite()
 			minetest.override_item(tname, {
 				tool_capabilities = toolcaps
 			})
-		else
-			-- This is needed to deal damage when punching mobs
-			-- with random items in hand in survival mode
-			minetest.override_item(tname, {
-				tool_capabilities = mcl_meshhand.survival_hand_tool_caps
-			})
 		end
 	end
 end
diff --git a/mods/PLAYER/mcl_meshhand/init.lua b/mods/PLAYER/mcl_meshhand/init.lua
index d3fa169ca..864a7c20b 100644
--- a/mods/PLAYER/mcl_meshhand/init.lua
+++ b/mods/PLAYER/mcl_meshhand/init.lua
@@ -90,3 +90,9 @@ if mcl_skins_enabled then
 else
 	minetest.register_on_joinplayer(mcl_meshhand.update_player)
 end
+
+-- This is needed to deal damage when punching mobs
+-- with random items in hand in survival mode
+minetest.override_item("", {
+	tool_capabilities = mcl_meshhand.survival_hand_tool_caps
+})