diff --git a/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts b/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts
index 20836a136f..cde6503843 100644
--- a/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts
+++ b/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts
@@ -8,9 +8,9 @@ import {
     OwidColumnDef,
     OwidVariableDimensions,
     OwidVariableDataMetadataDimensions,
-    EntityId,
     ErrorValue,
     OwidChartDimensionInterfaceWithMandatorySlug,
+    EntityName,
 } from "@ourworldindata/types"
 import {
     OwidTable,
@@ -332,20 +332,19 @@ export const legacyToOwidTableAndDimensions = (
         const entityColorColumnSlug = OwidTableSlugs.entityColor
 
         const valueFn = (
-            entityId: EntityId | undefined
+            entityName: EntityName | undefined
         ): string | ErrorValue => {
-            if (!entityId) return ErrorValueTypes.UndefinedButShouldBeString
-            const entityName =
-                joinedVariablesTable.entityIdToNameMap.get(entityId)
+            if (!entityName) return ErrorValueTypes.UndefinedButShouldBeString
             return entityName && selectedEntityColors
                 ? (selectedEntityColors[entityName] ??
                       ErrorValueTypes.UndefinedButShouldBeString)
                 : ErrorValueTypes.UndefinedButShouldBeString
         }
 
-        const values = joinedVariablesTable.rows.map((row) =>
-            valueFn(row.entityId)
-        )
+        const values =
+            joinedVariablesTable.entityNameColumn.valuesIncludingErrorValues.map(
+                (entityName) => valueFn(entityName as EntityName)
+            )
 
         joinedVariablesTable = joinedVariablesTable.appendColumns([
             {