diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 658cab1bed..1870d5a971 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -231,7 +231,9 @@ void Order::MakeImplicit(StationID destination)
 
 void Order::MakeWaiting()
 {
+	const bool wait_timetabled = this->IsWaitTimetabled();
 	this->type = OT_WAITING;
+	this->SetWaitTimetabled(wait_timetabled);
 }
 
 void Order::MakeLoadingAdvance(StationID destination)