diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java
index c66f22dcb..e7f604707 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java
@@ -24,6 +24,7 @@ import net.minecraft.block.Blocks;
 import net.minecraft.block.CocoaBlock;
 import net.minecraft.block.CropsBlock;
 import net.minecraft.block.SugarCaneBlock;
+import net.minecraft.block.SweetBerryBushBlock;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -51,14 +52,16 @@ public class HarvesterMovementBehaviour extends MovementBehaviour {
 
 	@Nullable
 	@Override
-	public ActorInstance createInstance(MaterialManager<?> materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) {
+	public ActorInstance createInstance(MaterialManager<?> materialManager, PlacementSimulationWorld simulationWorld,
+		MovementContext context) {
 		return new HarvesterActorInstance(materialManager, simulationWorld, context);
 	}
 
 	@Override
 	public void renderInContraption(MovementContext context, PlacementSimulationWorld renderWorld,
 		ContraptionMatrices matrices, IRenderTypeBuffer buffers) {
-		if (!Backend.getInstance().canUseInstancing())
+		if (!Backend.getInstance()
+			.canUseInstancing())
 			HarvesterRenderer.renderInContraption(context, renderWorld, matrices, buffers);
 	}
 
@@ -87,18 +90,18 @@ public class HarvesterMovementBehaviour extends MovementBehaviour {
 
 		ItemStack item = ItemStack.EMPTY;
 		float effectChance = 1;
-		
-		if (stateVisited.getBlock().is(BlockTags.LEAVES)) {
+
+		if (stateVisited.getBlock()
+			.is(BlockTags.LEAVES)) {
 			item = new ItemStack(Items.SHEARS);
 			effectChance = .45f;
 		}
-		
+
 		MutableBoolean seedSubtracted = new MutableBoolean(notCropButCuttable);
 		BlockState state = stateVisited;
 		BlockHelper.destroyBlockAs(world, pos, null, item, effectChance, stack -> {
-			if (AllConfigs.SERVER.kinetics.harvesterReplants.get()
-					&& !seedSubtracted.getValue()
-					&& stack.sameItem(new ItemStack(state.getBlock()))) {
+			if (AllConfigs.SERVER.kinetics.harvesterReplants.get() && !seedSubtracted.getValue()
+				&& stack.sameItem(new ItemStack(state.getBlock()))) {
 				stack.shrink(1);
 				seedSubtracted.setTrue();
 			}
@@ -109,24 +112,31 @@ public class HarvesterMovementBehaviour extends MovementBehaviour {
 	}
 
 	private boolean isValidCrop(World world, BlockPos pos, BlockState state) {
+		boolean harvestPartial = AllConfigs.SERVER.kinetics.harvestPartiallyGrown.get();
+		boolean replant = AllConfigs.SERVER.kinetics.harvesterReplants.get();
+		
 		if (state.getBlock() instanceof CropsBlock) {
 			CropsBlock crop = (CropsBlock) state.getBlock();
-			if (!crop.isMaxAge(state) && !AllConfigs.SERVER.kinetics.harvestPartiallyGrown.get())
-				return false;
-			return true;
+			if (harvestPartial)
+				return state.getValue(crop.getAgeProperty()) != 0 || !replant;
+			return crop.isMaxAge(state);
 		}
+
 		if (state.getCollisionShape(world, pos)
 			.isEmpty() || state.getBlock() instanceof CocoaBlock) {
 			for (Property<?> property : state.getProperties()) {
 				if (!(property instanceof IntegerProperty))
 					continue;
+				IntegerProperty ageProperty = (IntegerProperty) property;
 				if (!property.getName()
 					.equals(BlockStateProperties.AGE_1.getName()))
 					continue;
-				if (!AllConfigs.SERVER.kinetics.harvestPartiallyGrown.get()
-						&& (((IntegerProperty) property).getPossibleValues().size() - 1
-								!= state.getValue((IntegerProperty) property)
-								.intValue()))
+				int age = state.getValue(ageProperty)
+					.intValue();
+				if (state.getBlock() instanceof SweetBerryBushBlock && age <= 1 && replant)
+					continue;
+				if (age == 0 && replant || !harvestPartial && (ageProperty.getPossibleValues()
+					.size() - 1 != age))
 					continue;
 				return true;
 			}
@@ -140,7 +150,8 @@ public class HarvesterMovementBehaviour extends MovementBehaviour {
 			return false;
 		if (state.getBlock() instanceof SugarCaneBlock)
 			return true;
-		if (state.getBlock().is(BlockTags.LEAVES))
+		if (state.getBlock()
+			.is(BlockTags.LEAVES))
 			return true;
 
 		if (state.getCollisionShape(world, pos)
@@ -167,10 +178,10 @@ public class HarvesterMovementBehaviour extends MovementBehaviour {
 	private BlockState cutCrop(World world, BlockPos pos, BlockState state) {
 		if (!AllConfigs.SERVER.kinetics.harvesterReplants.get()) {
 			if (state.getFluidState()
-					.isEmpty())
+				.isEmpty())
 				return Blocks.AIR.defaultBlockState();
 			return state.getFluidState()
-					.createLegacyBlock();
+				.createLegacyBlock();
 		}
 
 		Block block = state.getBlock();
@@ -183,18 +194,18 @@ public class HarvesterMovementBehaviour extends MovementBehaviour {
 		}
 		if (block == Blocks.SUGAR_CANE || block instanceof AbstractPlantBlock) {
 			if (state.getFluidState()
-					.isEmpty())
+				.isEmpty())
 				return Blocks.AIR.defaultBlockState();
 			return state.getFluidState()
-					.createLegacyBlock();
+				.createLegacyBlock();
 		}
 		if (state.getCollisionShape(world, pos)
-				.isEmpty() || block instanceof CocoaBlock) {
+			.isEmpty() || block instanceof CocoaBlock) {
 			for (Property<?> property : state.getProperties()) {
 				if (!(property instanceof IntegerProperty))
 					continue;
 				if (!property.getName()
-						.equals(BlockStateProperties.AGE_1.getName()))
+					.equals(BlockStateProperties.AGE_1.getName()))
 					continue;
 				return state.setValue((IntegerProperty) property, Integer.valueOf(0));
 			}