diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index e00c0bc29f..0a990d87f5 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -3448,6 +3448,8 @@ static void CheckIfTrainNeedsService(Vehicle *v)
 		return;
 	}
 
+	if (v->current_order.type == OT_LOADING) v->LeaveStation();
+
 	v->current_order.type = OT_GOTO_DEPOT;
 	v->current_order.flags = OF_NON_STOP;
 	v->current_order.dest = depot->index;