diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp
index 0ef1ed5e9e..2af271b4c7 100644
--- a/src/timetable_cmd.cpp
+++ b/src/timetable_cmd.cpp
@@ -547,7 +547,7 @@ static inline bool IsOrderUsableForSeparation(const Order *order)
 		return false;
 	}
 
-	if (order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION)) {
+	if (order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION) && !(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) {
 		// non-station orders are permitted to have 0 wait times
 		return false;
 	}
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index b3011428d3..7045188326 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -578,7 +578,7 @@ struct TimetableWindow : Window {
 							have_conditional = true;
 							if (!order->IsWaitTimetabled()) have_non_timetabled_conditional_branch = true;
 						} else {
-							if (order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION)) {
+							if (order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION) && !(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) {
 								have_missing_wait = true;
 							}
 							if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled()) {