diff --git a/core/src/mindustry/ai/types/CargoAI.java b/core/src/mindustry/ai/types/CargoAI.java
index f9572b9c3f..d09359d221 100644
--- a/core/src/mindustry/ai/types/CargoAI.java
+++ b/core/src/mindustry/ai/types/CargoAI.java
@@ -60,8 +60,8 @@ public class CargoAI extends AIController{
                 }
             }else{
 
-                //what if some prankster reconfigures the source while the unit is moving? we can't have that!
-                if(unloadTarget.item != itemTarget){
+                //what if some prankster reconfigures or picks up the target while the unit is moving? we can't have that!
+                if(unloadTarget.item != itemTarget || unloadTarget.isPayload()){
                     unloadTarget = null;
                     return;
                 }