diff --git a/src/openrct2/drawing/ImageId.hpp b/src/openrct2/drawing/ImageId.hpp
index 56c2609a80..9ff384cb9a 100644
--- a/src/openrct2/drawing/ImageId.hpp
+++ b/src/openrct2/drawing/ImageId.hpp
@@ -107,7 +107,7 @@ public:
     ImageId() = default;
 
     explicit constexpr ImageId(ImageIndex index)
-        : _index(index)
+        : _index(index == INDEX_UNDEFINED ? ImageIndexUndefined : index)
     {
     }
 
@@ -144,7 +144,7 @@ public:
 
     bool HasValue() const
     {
-        return GetIndex() != INDEX_UNDEFINED;
+        return GetIndex() != ImageIndexUndefined;
     }
 
     bool HasPrimary() const