diff --git a/src/openrct2/object/TerrainEdgeObject.cpp b/src/openrct2/object/TerrainEdgeObject.cpp
index 2fb1ea3591..3bccf9c044 100644
--- a/src/openrct2/object/TerrainEdgeObject.cpp
+++ b/src/openrct2/object/TerrainEdgeObject.cpp
@@ -64,6 +64,6 @@ void TerrainEdgeObject::ReadJson(IReadObjectContext* context, json_t& root)
 TerrainEdgeObject* TerrainEdgeObject::GetById(ObjectEntryIndex entryIndex)
 {
     auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
-    auto obj = objMgr.GetLoadedObject(ObjectType::TerrainEdge, entryIndex);
-    return obj != nullptr ? static_cast<TerrainEdgeObject*>(obj) : nullptr;
+    auto* obj = objMgr.GetLoadedObject(ObjectType::TerrainEdge, entryIndex);
+    return static_cast<TerrainEdgeObject*>(obj);
 }
diff --git a/src/openrct2/object/TerrainSurfaceObject.cpp b/src/openrct2/object/TerrainSurfaceObject.cpp
index 7adf3629d7..e90e8a72ba 100644
--- a/src/openrct2/object/TerrainSurfaceObject.cpp
+++ b/src/openrct2/object/TerrainSurfaceObject.cpp
@@ -160,6 +160,6 @@ uint32_t TerrainSurfaceObject::GetImageId(
 TerrainSurfaceObject* TerrainSurfaceObject::GetById(ObjectEntryIndex entryIndex)
 {
     auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
-    auto obj = objMgr.GetLoadedObject(ObjectType::TerrainSurface, entryIndex);
-    return obj != nullptr ? static_cast<TerrainSurfaceObject*>(obj) : nullptr;
+    auto* obj = objMgr.GetLoadedObject(ObjectType::TerrainSurface, entryIndex);
+    return static_cast<TerrainSurfaceObject*>(obj);
 }