diff --git a/src/ride/ride.c b/src/ride/ride.c
index 9e85a9be3d..48df71ab69 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -2146,7 +2146,7 @@ static void ride_breakdown_update(int rideIndex)
 			ride->downtime_history[7];
 		ride->downtime = min(totalDowntime / 2, 100);
 
-		memmove(&ride->downtime_history[1], ride->downtime_history, sizeof(ride->downtime_history));
+		memmove(&ride->downtime_history[1], ride->downtime_history, sizeof(ride->downtime_history) - 1);
 
 		ride->downtime_history[0] = 0;
 		ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE;
diff --git a/src/windows/ride.c b/src/windows/ride.c
index fd77ef949e..bef89ed4db 100644
--- a/src/windows/ride.c
+++ b/src/windows/ride.c
@@ -6065,10 +6065,12 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi)
 	y += 10;
 
 	// Queue time
-	queueTime = ride_get_max_queue_time(ride);
-	stringId = queueTime == 1 ? STR_QUEUE_TIME_MINUTE : STR_QUEUE_TIME_MINUTES;
-	y += gfx_draw_string_left_wrapped(dpi, &queueTime, x, y, 308, stringId, 0);
-	y += 5;
+	if (gRideClassifications[ride->type] == RIDE_CLASS_RIDE) {
+		queueTime = ride_get_max_queue_time(ride);
+		stringId = queueTime == 1 ? STR_QUEUE_TIME_MINUTE : STR_QUEUE_TIME_MINUTES;
+		y += gfx_draw_string_left_wrapped(dpi, &queueTime, x, y, 308, stringId, 0);
+		y += 5;
+	}
 
 	// Primary shop items sold
 	shopItem = get_ride_entry_by_ride(ride)->shop_item;