--- a/src/station_cmd.cpp	Mon Aug 04 18:27:54 2008 +0000
+++ b/src/station_cmd.cpp	Mon Aug 04 18:54:19 2008 +0000
@@ -2221,7 +2221,7 @@
 	if (t == NULL || t->seq == NULL) t = &_station_display_datas[GetStationType(ti->tile)][GetStationGfx(ti->tile)];
 
 
-	if (IsBuoy(ti->tile) || IsDock(ti->tile) || IsOilRig(ti->tile)) {
+	if (IsBuoy(ti->tile) || IsDock(ti->tile) || (IsOilRig(ti->tile) && GetWaterClass(ti->tile) != WATER_CLASS_INVALID)) {
 		if (ti->tileh == SLOPE_FLAT) {
 			DrawWaterClassGround(ti);
 		} else {