diff --git a/mods/ITEMS/mcl_honey/init.lua b/mods/ITEMS/mcl_honey/init.lua
index a870e7c08..9aa5167f5 100644
--- a/mods/ITEMS/mcl_honey/init.lua
+++ b/mods/ITEMS/mcl_honey/init.lua
@@ -15,13 +15,13 @@ function mcl_honey.wax_block(pos, node, player, itemstack)
 	end
 
 	local def = minetest.registered_nodes[node.name]
+	if not def then return end
 
-	if def and def._mcl_waxed_variant then
-		node.name = def._mcl_waxed_variant
-	else
-		return
-	end
+	-- Handle right-clicking nodes
+	local new_stack = mcl_util.call_on_rightclick(itemstack, player, {type = "node", under = pos})
+	if new_stack and new_stack ~= itemstack then return end
 
+	if not def._mcl_waxed_variant then return end
 	node.name = def._mcl_waxed_variant
 	minetest.set_node(pos, node)
 	awards.unlock(player:get_player_name(), "mcl:wax_on")