diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
index c4a98e797..3517bb2f7 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
@@ -1073,6 +1073,8 @@ public class LocalSession implements TextureHolder {
             BrushCache.setTool(item, (BrushTool) tool);
             if (tool != null) {
                 ((BrushTool) tool).setHolder(item);
+            } else {
+                this.tools[type.getInternalId()] = null;
             }
         } else {
             previous = this.tools[type.getInternalId()];