diff --git a/lib/views/home/news/news_details/news_details_state.dart b/lib/views/home/news/news_details/news_details_state.dart
index 879a178..279bc78 100644
--- a/lib/views/home/news/news_details/news_details_state.dart
+++ b/lib/views/home/news/news_details/news_details_state.dart
@@ -84,7 +84,7 @@ class NewsDetailsState extends CoreProvier {
       news.any((n) => newsItem != null && n != null && n.id == newsItem.id);
 
   void onCommentsChanged(int count) {
-    news.firstWhere((item) => item!.id == currentNews.id)!.comments = count;
+    news.firstWhere((item) => item?.id == currentNews.id)!.comments = count;
     notifyListeners();
   }
 
diff --git a/lib/views/home/radar/radar_details/radar_details_state.dart b/lib/views/home/radar/radar_details/radar_details_state.dart
index 2095cec..37ebb42 100644
--- a/lib/views/home/radar/radar_details/radar_details_state.dart
+++ b/lib/views/home/radar/radar_details/radar_details_state.dart
@@ -116,7 +116,7 @@ class RadarDetailsState extends CoreProvier {
       radars.any((r) => radar != null && r != null && r.id == radar.id);
 
   void onCommentsChanged(int count) {
-    radars.firstWhere((radar) => radar!.id == currentRadar.id)!.comments =
+    radars.firstWhere((radar) => radar?.id == currentRadar.id)!.comments =
         count;
     notifyListeners();
   }