diff --git a/lib/data/models/game.dart b/lib/data/models/game.dart
index ec69204..d5bd3e8 100644
--- a/lib/data/models/game.dart
+++ b/lib/data/models/game.dart
@@ -73,7 +73,11 @@ class Game {
         orElse: () => Ruleset.singleWinner,
       ),
       description = json['description'],
-      color = AppColor.values.firstWhere((e) => e.name == json['color']),
+      color = AppColor.values.firstWhere(
+        (value) =>
+            value.name == json['color'] || value.toString() == json['color'],
+        orElse: () => AppColor.blue,
+      ),
       icon = json['icon'];
 
   Map<String, dynamic> toJson() => {
diff --git a/lib/data/models/team.dart b/lib/data/models/team.dart
index 56576c8..0069a1f 100644
--- a/lib/data/models/team.dart
+++ b/lib/data/models/team.dart
@@ -71,7 +71,11 @@ class Team {
     : id = json['id'],
       name = json['name'],
       createdAt = DateTime.parse(json['createdAt']),
-      color = AppColor.values.byName(json['color'] ?? AppColor.blue.name),
+      color = AppColor.values.firstWhere(
+        (value) =>
+            value.name == json['color'] || value.toString() == json['color'],
+        orElse: () => AppColor.blue,
+      ),
       score = json['score'] ?? 0,
       members = []; // Populated during import via DataTransferService