diff --git a/react-frontend/src/components/IncidentsBlock.jsx b/react-frontend/src/components/IncidentsBlock.jsx
index 1a300332..c1e4199a 100644
--- a/react-frontend/src/components/IncidentsBlock.jsx
+++ b/react-frontend/src/components/IncidentsBlock.jsx
@@ -17,7 +17,9 @@ const IncidentsBlock = ({ service, group }) => {
         data = await API.incidents_service(service.id);
       }
 
-      setIncidents(data || []);
+      if(Array.isArray(data)) {
+        setIncidents(data);
+      }
     }
     fetchData();
   }, [service.id, group?.id]);
@@ -37,7 +39,7 @@ const IncidentsBlock = ({ service, group }) => {
             const latestUpdate =
               updates?.length > 0 && updates[0];
             const updatedAt = latestUpdate
-              ? latestUpdate.updated_at
+              ? latestUpdate.created_at
               : updated_at;
 
             return (