diff --git a/core/src/mindustry/ai/types/MinerAI.java b/core/src/mindustry/ai/types/MinerAI.java
index 6646124942..eb4307021b 100644
--- a/core/src/mindustry/ai/types/MinerAI.java
+++ b/core/src/mindustry/ai/types/MinerAI.java
@@ -19,15 +19,10 @@ public class MinerAI extends AIController{
 
         if(!(unit.canMine()) || core == null) return;
 
-        if(unit.mineTile != null && !unit.mineTile.within(unit, unit.type.mineRange)){
+        if(!unit.validMine(unit.mineTile)){
             unit.mineTile(null);
         }
 
-        if(ore != null && !unit.validMine(ore)){
-            ore = null;
-            unit.mineTile = null;
-        }
-
         if(mining){
             if(timer.get(timerTarget2, 60 * 4) || targetItem == null){
                 targetItem = unit.type.mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i));