diff --git a/src/main/java/org/violetmoon/zeta/util/handler/ToolInteractionHandler.java b/src/main/java/org/violetmoon/zeta/util/handler/ToolInteractionHandler.java
index cb9c4a5..8be4cfd 100644
--- a/src/main/java/org/violetmoon/zeta/util/handler/ToolInteractionHandler.java
+++ b/src/main/java/org/violetmoon/zeta/util/handler/ToolInteractionHandler.java
@@ -100,7 +100,7 @@ public static void toolActionEvent(ZBlock.BlockToolModification event) {
 				BlockState state = event.getState();
 				Block block = state.getBlock();
 
-				if(waxableBlock.block == block) {
+				if(waxableBlock.block == block && state.getValue(waxableBlock.property)) {
 					event.setFinalState(copyState(state, waxableBlock.block)
 							.setValue(waxableBlock.property, false)
 					);
@@ -137,7 +137,7 @@ public static void itemUse(ZRightClickBlock event) {
 			}
 
 			for (BooleanPropertyWaxableBlock waxableBlock : booleanPropertySet) {
-				if(waxableBlock.block == block) {
+				if(waxableBlock.block == block && !state.getValue(waxableBlock.property)) {
 					if(event.getEntity() instanceof ServerPlayer sp)
 						CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(sp, pos, stack);