diff --git a/lib/pages/analytics/models/occupancy_heat_map_model.dart b/lib/pages/analytics/models/occupancy_heat_map_model.dart
index cd332745..60d1a453 100644
--- a/lib/pages/analytics/models/occupancy_heat_map_model.dart
+++ b/lib/pages/analytics/models/occupancy_heat_map_model.dart
@@ -14,13 +14,16 @@ class OccupancyHeatMapModel extends Equatable {
   });
 
   factory OccupancyHeatMapModel.fromJson(Map<String, dynamic> json) {
+    final eventDate = json['event_date'] as String? ?? '${DateTime.now()}';
+    final year = eventDate.split('-')[0];
+    final month = eventDate.split('-')[1];
+    final day = eventDate.split('-')[2];
+
     return OccupancyHeatMapModel(
       uuid: json['uuid'] as String? ?? '',
-      eventDate: DateTime.parse(
-        json['event_date'] as String? ?? '${DateTime.now()}',
-      ),
+      eventDate: DateTime(int.parse(year), int.parse(month), int.parse(day)),
       countTotalPresenceDetected: num.parse(
-        json['count_total_presence_detected']?.toString() ?? '900',
+        json['count_total_presence_detected']?.toString() ?? '0',
       ).toInt(),
     );
   }