diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java
index 7844cb0b..a6f8b971 100644
--- a/src/main/java/tconstruct/library/tools/HarvestTool.java
+++ b/src/main/java/tconstruct/library/tools/HarvestTool.java
@@ -98,7 +98,12 @@ public abstract class HarvestTool extends ToolCore {
     public Set<String> getToolClasses(ItemStack stack) {
         Set<String> set = new HashSet<>();
 
-        if (stack != null && stack.getItem() instanceof HarvestTool) {
+        if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof HarvestTool) {
+
+            // Broken tools are not considered as valid for tool classes
+            NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
+            if (tags == null || tags.getBoolean("Broken")) return set;
+
             set.add(((HarvestTool) stack.getItem()).getHarvestType());
         }