diff --git a/webapp/src/components/table/calculation/calculationRow.tsx b/webapp/src/components/table/calculation/calculationRow.tsx
index 17b9ab655a0..712cdc3c7b4 100644
--- a/webapp/src/components/table/calculation/calculationRow.tsx
+++ b/webapp/src/components/table/calculation/calculationRow.tsx
@@ -39,7 +39,7 @@ const CalculationRow = (props: Props): JSX.Element => {
 
     const templates: IPropertyTemplate[] = [
         titleTemplate,
-        ...props.board.fields.cardProperties.filter((template) => props.activeView.fields.visiblePropertyIds.includes(template.id)),
+        ...props.activeView.fields.visiblePropertyIds.map((id) => props.board.fields.cardProperties.find((t) => t.id === id)).filter((i) => i) as IPropertyTemplate[],
     ]
 
     const selectedCalculations = props.board.fields.columnCalculations || []