diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 3620661c43..fd3f8158ad 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -4878,7 +4878,7 @@ static void WindowRideColourPaint(rct_window* w, rct_drawpixelinfo* dpi)
             gfx_clear(&clippedDpi, PALETTE_INDEX_12);
 
             auto stationObj = ride_get_station_object(ride);
-            if (stationObj != nullptr && stationObj->BaseImageId != 0)
+            if (stationObj != nullptr && stationObj->BaseImageId != ImageIndexUndefined)
             {
                 auto imageTemplate = ImageId(trackColour.main, trackColour.additional);
                 auto imageId = imageTemplate.WithIndex(stationObj->BaseImageId);
diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
index 369d5bdcb2..17bc837d65 100644
--- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
@@ -118,7 +118,7 @@ static void PaintRideEntranceExit(paint_session* session, uint8_t direction, int
     }
 
     auto stationObj = ride_get_station_object(ride);
-    if (stationObj == nullptr || stationObj->BaseImageId == 0)
+    if (stationObj == nullptr || stationObj->BaseImageId == ImageIndexUndefined)
     {
         return;
     }