diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 67afd5a1d0..95c8ae5e7a 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2193,7 +2193,7 @@ static void DrawTile_Station(TileInfo *ti)
 	if (t == NULL || t->seq == NULL) t = &_station_display_datas[GetStationType(ti->tile)][GetStationGfx(ti->tile)];
 
 
-	if (IsBuoy(ti->tile) || IsDock(ti->tile)) {
+	if (IsBuoy(ti->tile) || IsDock(ti->tile) || IsOilRig(ti->tile)) {
 		if (ti->tileh == SLOPE_FLAT) {
 			DrawWaterClassGround(ti);
 		} else {
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index dd90530ed4..db68721787 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -535,7 +535,10 @@ static bool IsWateredTile(TileIndex tile, Direction from)
 			}
 			return false;
 
-		case MP_STATION:  return IsOilRig(tile) || (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsBuoy(tile);
+		case MP_STATION:
+			if (IsOilRig(tile)) return GetWaterClass(tile) != WATER_CLASS_INVALID;
+			return (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsBuoy(tile);
+
 		case MP_INDUSTRY: return IsIndustryTileOnWater(tile);
 		case MP_TUNNELBRIDGE: return GetTunnelBridgeTransportType(tile) == TRANSPORT_WATER && ReverseDiagDir(GetTunnelBridgeDirection(tile)) == DirToDiagDir(from);
 		default:          return false;