diff --git a/OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs b/OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
index a499fe3297..2cc76f3975 100644
--- a/OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
+++ b/OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
@@ -62,10 +62,15 @@ namespace OpenRA.Mods.Common.Activities
 
 				case DockingState.Dock:
 					if (Refinery.IsInWorld && !Refinery.IsDead)
+					{
 						foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
 							nd.Docked(Refinery, self);
 
-					OnStateDock(self);
+						OnStateDock(self);
+					}
+					else
+						dockingState = DockingState.Undock;
+
 					return false;
 
 				case DockingState.Loop: