diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index 69f3abd50..ab37da19f 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -499,18 +499,21 @@ class ReportResult {
   }
 
   List<DataRow> tableRows(BuildContext context) {
-    return [
-      for (var i = 0; i < data.length; i++)
-        DataRow(
-          cells: data[i]
-              .map(
-                (row) => DataCell(
-                  row.renderWidget(context, columns[data[i].indexOf(row)]),
-                ),
-              )
-              .toList(),
-        )
-    ];
+    final rows = <DataRow>[];
+
+    for (var i = 0; i < data.length; i++) {
+      final row = data[i];
+      final cells = <DataCell>[];
+
+      for (var j = 0; j < row.length; j++) {
+        final cell = row[j];
+        cells.add(DataCell(cell.renderWidget(context, columns[i])));
+      }
+
+      rows.add(DataRow(cells: cells));
+    }
+
+    return rows;
   }
 }