diff --git a/src/main/java/com/dynamitos/mixin/MoveItemsTaskMixin.java b/src/main/java/com/dynamitos/mixin/MoveItemsTaskMixin.java
index ba12989..5971a27 100644
--- a/src/main/java/com/dynamitos/mixin/MoveItemsTaskMixin.java
+++ b/src/main/java/com/dynamitos/mixin/MoveItemsTaskMixin.java
@@ -116,9 +116,13 @@ public abstract class MoveItemsTaskMixin extends MultiTickTask<PathAwareEntity>
     @Inject(method = "isUnchanged", at = @At("HEAD"), cancellable = true)
     private void isUnchanged(World world, MoveItemsTask.Storage storage, CallbackInfoReturnable<Boolean> callbackInfo) {
         Copperfarmers.LOGGER.debug("Wrapped isUnchanged called");
-        if(storage.state().isOf(Blocks.FARMLAND)) {
+        if(storage.state().isOf(Blocks.FARMLAND) && world.isAir(storage.pos().up())) {
             callbackInfo.setReturnValue(true);
         }
+        if(storage.inventory() == null) {
+            Copperfarmers.LOGGER.debug("No inventory at " + storage.pos());
+            callbackInfo.setReturnValue(false);
+        }
     }
 
     private void placeStack2(PathAwareEntity entity, MoveItemsTask.Storage storage) {