diff --git a/src/strings.cpp b/src/strings.cpp
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -863,8 +863,8 @@ static char *FormatString(char *buff, co
 					int64 temp[2];
 					temp[0] = wp->town->index;
 					temp[1] = wp->town_cn + 1;
-					StringID str = wp->town_cn == 0 ? STR_WAYPOINTNAME_CITY : STR_WAYPOINTNAME_CITY_SERIAL;
-
+					StringID str = ((wp->string_id == STR_SV_STNAME_BUOY) ? STR_BUOYNAME_CITY : STR_WAYPOINTNAME_CITY);
+					if (wp->town_cn != 0) str++;
 					buff = GetStringWithArgs(buff, str, temp, last);
 				}
 				break;