diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index 0c0a3b0e52..3e7ff11afa 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -213,7 +213,8 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
 					if (wp->TileBelongsToRailStation(t)) return t;
 				}
 			}
-			return INVALID_TILE;
+			/* If the waypoint has no rail waypoint tiles, it must have a buoy */
+			return wp->xy;
 		}
 		default:               return INVALID_TILE;
 	}