diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
index 8c53e47e..90891efb 100644
--- a/lib/src/database/hive_database.dart
+++ b/lib/src/database/hive_database.dart
@@ -916,10 +916,10 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
         return;
       }
 
-      final status = newStatus.isError || prevEvent == null
+      final status = newStatus.isError || prevStatus == null
           ? newStatus
           : latestEventStatus(
-              prevStatus!,
+              prevStatus,
               newStatus,
             );