diff --git a/OpenRa.Game/Traits/Activities/DeliverOre.cs b/OpenRa.Game/Traits/Activities/DeliverOre.cs
index 4bec3e9966..42845e8393 100644
--- a/OpenRa.Game/Traits/Activities/DeliverOre.cs
+++ b/OpenRa.Game/Traits/Activities/DeliverOre.cs
@@ -28,6 +28,8 @@ namespace OpenRa.Game.Traits.Activities
 				self.traits.Get<Harvester>().Deliver( self );
 				return NextActivity ?? new Harvest();
 			}
+			else if( NextActivity != null )
+				return NextActivity;
 			else if( refinery == null || refinery.IsDead || self.Location != refinery.Location + refineryDeliverOffset )
 			{
 				var search = new PathSearch