diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp
index c26b4e73b2..809a4149b0 100644
--- a/src/timetable_cmd.cpp
+++ b/src/timetable_cmd.cpp
@@ -668,15 +668,7 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
 			new_time = time_loading;
 		}
 
-		/* Check for too large a difference from expected time, and if so don't average. */
-		if (!(new_time > (int32)timetabled * 2 || new_time < (int32)timetabled / 2)) {
-			int arrival_error = timetabled - new_time;
-			/* Compute running average, with sign conversion to avoid negative overflow. */
-			new_time = ((int32)timetabled * 4 + new_time + 2) / 5;
-			/* Use arrival_error to finetune order ticks. */
-			if (arrival_error < 0) new_time++;
-			if (arrival_error > 0) new_time--;
-		} else if (new_time > (int32)timetabled * 10 && travelling) {
+		if (new_time > (int32)timetabled * 4 && travelling) {
 			/* Possible jam, clear time and restart timetable for all vehicles.
 			 * Otherwise we risk trains blocking 1-lane stations for long times. */
 			ChangeTimetable(v, v->cur_real_order_index, 0, travelling ? MTF_TRAVEL_TIME : MTF_WAIT_TIME, true);
@@ -686,6 +678,15 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
 				SetWindowDirty(WC_VEHICLE_TIMETABLE, v2->index);
 			}
 			return;
+		} else if (new_time >= (int32)timetabled / 2) {
+			/* Compute running average, with sign conversion to avoid negative overflow. */
+			if (new_time < (int32)timetabled) {
+				new_time = ((int32)timetabled * 3 + new_time * 2 + 2) / 5;
+			} else {
+				new_time = ((int32)timetabled * 9 + new_time + 5) / 10;
+			}
+		} else {
+			/* new time is less than hald old time, set value directly */
 		}
 
 		if (new_time < 1) new_time = 1;