diff --git a/lib/pangea/analytics_data/analytics_database.dart b/lib/pangea/analytics_data/analytics_database.dart
index 23dd4be8c..8a1f089c5 100644
--- a/lib/pangea/analytics_data/analytics_database.dart
+++ b/lib/pangea/analytics_data/analytics_database.dart
@@ -383,8 +383,8 @@ class AnalyticsDatabase with DatabaseFileStorage {
 
       ConstructUses model;
 
-      if (raw is Map<String, dynamic>) {
-        model = ConstructUses.fromJson(raw);
+      if (raw != null) {
+        model = ConstructUses.fromJson(Map<String, dynamic>.from(raw));
       } else {
         final u = usesForKey.first;
         model = ConstructUses(