diff --git a/src/components/filters/DateFilter.tsx b/src/components/filters/DateFilter.tsx
index 97d8714..4a37790 100644
--- a/src/components/filters/DateFilter.tsx
+++ b/src/components/filters/DateFilter.tsx
@@ -36,6 +36,9 @@ const FilterDate = ({ id, dispatch }: filterProps) => {
   const [isDateFilterSelectOpen, setIsDateFilterSelectOpen] = useState(false)
 
   useEffect(() => {
+    if (!date1) {
+      return
+    }
     switch (selectedDateFilter) {
       case DateFilterOption.IS:
         dispatch({ type: 'UPDATE_FILTER', payload: { id: id, operation: (incident) => incident.dateString === date1 } })
@@ -47,6 +50,9 @@ const FilterDate = ({ id, dispatch }: filterProps) => {
         dispatch({ type: 'UPDATE_FILTER', payload: { id: id, operation: (incident) => incident.dateString > date1 } })
         break
       case DateFilterOption.IS_BETWEEN:
+        if (!date2) {
+          return
+        }
         dispatch({
           type: 'UPDATE_FILTER',
           payload: { id: id, operation: (incident) => date1 <= incident.dateString && incident.dateString <= date2 },
diff --git a/src/components/graphs/IncidentsStats.tsx b/src/components/graphs/IncidentsStats.tsx
index 8ffbea5..e3becd0 100644
--- a/src/components/graphs/IncidentsStats.tsx
+++ b/src/components/graphs/IncidentsStats.tsx
@@ -2,6 +2,44 @@ import { DB, Incident } from '@/types'
 import { calculateBounds } from '@/utils'
 import { useMemo } from 'react'
 
+export function calculateIncidentStats(data: DB, incidents: [string, Incident][]) {
+  const totalincidents = incidents.length
+
+  const countriesSet = new Set<string>()
+  const departmentsSet = new Set<string>()
+  const municipalitiesSet = new Set<string>()
+  const dates: Date[] = []
+  const typesSet = new Set<string>()
+
+  incidents.forEach(([_, incident]) => {
+    countriesSet.add(incident.country)
+    departmentsSet.add(incident.department)
+    municipalitiesSet.add(incident.municipality)
+    dates.push(new Date(incident.dateString))
+    typesSet.add(incident.typeID as string)
+  })
+
+  const earliestDate = new Date(Math.min(...dates.map((date) => date.getTime())))
+  const latestDate = new Date(Math.max(...dates.map((date) => date.getTime())))
+
+  const categoriesSet = new Set<string>()
+  typesSet.forEach((typeID) => {
+    const categoryID = data.Types[typeID].categoryID
+    categoriesSet.add(categoryID as string)
+  })
+
+  return {
+    totalincidents,
+    countriesCount: countriesSet.size,
+    departmentsCount: departmentsSet.size,
+    municipalitiesCount: municipalitiesSet.size,
+    earliestDate,
+    latestDate,
+    categoriesCount: categoriesSet.size,
+    typesCount: typesSet.size,
+  }
+}
+
 export default function IncidentsStats({
   data,
   incidents,
@@ -11,43 +49,7 @@ export default function IncidentsStats({
   incidents: [string, Incident][]
   bounds: ReturnType<typeof calculateBounds>
 }) {
-  const stats = useMemo(() => {
-    const totalincidents = bounds.totalCount
-
-    const countriesSet = new Set<string>()
-    const departmentsSet = new Set<string>()
-    const municipalitiesSet = new Set<string>()
-    const dates: Date[] = []
-    const typesSet = new Set<string>()
-
-    incidents.forEach(([_, incident]) => {
-      countriesSet.add(incident.country)
-      departmentsSet.add(incident.department)
-      municipalitiesSet.add(incident.municipality)
-      dates.push(new Date(incident.dateString))
-      typesSet.add(incident.typeID as string)
-    })
-
-    const earliestDate = new Date(Math.min(...dates.map((date) => date.getTime())))
-    const latestDate = new Date(Math.max(...dates.map((date) => date.getTime())))
-
-    const categoriesSet = new Set<string>()
-    typesSet.forEach((typeID) => {
-      const categoryID = data.Types[typeID].categoryID
-      categoriesSet.add(categoryID as string)
-    })
-
-    return {
-      totalincidents,
-      countriesCount: countriesSet.size,
-      departmentsCount: departmentsSet.size,
-      municipalitiesCount: municipalitiesSet.size,
-      earliestDate,
-      latestDate,
-      categoriesCount: categoriesSet.size,
-      typesCount: typesSet.size,
-    }
-  }, [incidents, bounds])
+  const stats = useMemo(() => calculateIncidentStats(data, incidents), [incidents, data])
 
   return (
     <div className="relative aspect-[2/1] min-w-[300px] flex-grow overflow-y-auto rounded-lg bg-neutral-100 p-2">
diff --git a/src/utils.ts b/src/utils.ts
index 72a7812..cc9dc69 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -122,5 +122,9 @@ export function filterIncidents(incidents: DB['Incidents'],
 }
 
 export function formatDateString(dateString: string): string {
-  return new Date(dateString).toLocaleDateString('es-ES', { timeZone: 'UTC' })
-}
\ No newline at end of file
+  const date = new Date(dateString)
+  if (isNaN(date.getTime())) {
+    return 'Fecha inválida'
+  }
+  return date.toLocaleDateString('es-ES', { timeZone: 'UTC' })
+}