diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 112b552d84..3f0398332a 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -577,7 +577,7 @@ struct TimetableWindow : Window {
 							}
 						}
 
-						if (!have_bad_full_load && (assume_timetabled || order->IsWaitTimetabled())) {
+						if (order->IsType(OT_GOTO_STATION) && !have_bad_full_load && (assume_timetabled || order->IsWaitTimetabled())) {
 							if (order->GetLoadType() & OLFB_FULL_LOAD) have_bad_full_load = true;
 							if (order->GetLoadType() == OLFB_CARGO_TYPE_LOAD) {
 								for (CargoID c = 0; c < NUM_CARGO; c++) {