diff --git a/src/main/java/com/minecolonies/coremod/entity/ai/mobs/barbarians/EntityAIWalkToRandomHuts.java b/src/main/java/com/minecolonies/coremod/entity/ai/mobs/barbarians/EntityAIWalkToRandomHuts.java
index 79aabbfadc9..bd42110e1e0 100644
--- a/src/main/java/com/minecolonies/coremod/entity/ai/mobs/barbarians/EntityAIWalkToRandomHuts.java
+++ b/src/main/java/com/minecolonies/coremod/entity/ai/mobs/barbarians/EntityAIWalkToRandomHuts.java
@@ -140,7 +140,7 @@ private boolean isEntityAtSiteWithMove(@NotNull final BlockPos site, final int r
         }
 
         if (new AxisAlignedBB(entity.getPosition()).expand(1, 1, 1)
-              .intersects(new AxisAlignedBB(entity.getPosition())))
+              .intersects(new AxisAlignedBB(lastPos)))
         {
             stuckTime++;
         }
@@ -187,6 +187,7 @@ private boolean isEntityAtSiteWithMove(@NotNull final BlockPos site, final int r
                             break;
                         default:
                             posToDestroy = entity.getPosition().up();
+                            break;
 
                     }
                     world.destroyBlock(posToDestroy, true);