diff --git a/lib/helpers/widgets/dashbaord/attendance_overview_chart.dart b/lib/helpers/widgets/dashbaord/attendance_overview_chart.dart
index 9cf0a75..9a88c65 100644
--- a/lib/helpers/widgets/dashbaord/attendance_overview_chart.dart
+++ b/lib/helpers/widgets/dashbaord/attendance_overview_chart.dart
@@ -46,13 +46,9 @@ class AttendanceDashboardChart extends StatelessWidget {
     Color(0xFF64B5F6), // Blue 300 (repeat)
   ];
 
-  static final Map<String, Color> _roleColorMap = {};
-
   Color _getRoleColor(String role) {
-    return _roleColorMap.putIfAbsent(
-      role,
-      () => _flatColors[_roleColorMap.length % _flatColors.length],
-    );
+    final index = role.hashCode.abs() % _flatColors.length;
+    return _flatColors[index];
   }
 
   @override
diff --git a/lib/helpers/widgets/dashbaord/project_progress_chart.dart b/lib/helpers/widgets/dashbaord/project_progress_chart.dart
index 3162f11..f615687 100644
--- a/lib/helpers/widgets/dashbaord/project_progress_chart.dart
+++ b/lib/helpers/widgets/dashbaord/project_progress_chart.dart
@@ -50,13 +50,9 @@ class ProjectProgressChart extends StatelessWidget {
   ];
   static final NumberFormat _commaFormatter = NumberFormat.decimalPattern();
 
-  static final Map<String, Color> _taskColorMap = {};
-
   Color _getTaskColor(String taskName) {
-    return _taskColorMap.putIfAbsent(
-      taskName,
-      () => _flatColors[_taskColorMap.length % _flatColors.length],
-    );
+    final index = taskName.hashCode % _flatColors.length;
+    return _flatColors[index];
   }
 
   @override