diff --git a/src/__tests__/components/DateSelector.test.tsx b/src/__tests__/components/DateSelector.test.tsx
index 992b5729..252b1cff 100644
--- a/src/__tests__/components/DateSelector.test.tsx
+++ b/src/__tests__/components/DateSelector.test.tsx
@@ -4,10 +4,11 @@ import { DeviceEventEmitter } from 'react-native';
 import { render, userEvent, screen, act } from '../../shared/testUtils';
 
 const mockedTestID = 'mockedTestID';
-const mockOnChange = jest.fn();
+let mockOnChange: jest.Mock<unknown, unknown[], unknown>;
 let tree: ReturnType<typeof render>;
 
 beforeEach(() => {
+    mockOnChange = jest.fn();
     tree = render(
         <DateSelector
             prefilled={new Date(2003, 1, 1)}
@@ -69,6 +70,25 @@ describe('MODULE | DateField', () => {
         expect(yearField.props.value).toBe('06');
     });
 
+    it('should not cast invalid date into a valid one', async () => {
+        const user = userEvent.setup();
+
+        const dayField = screen.getByTestId(mockedTestID + '/day');
+        await user.type(dayField, '33');
+
+        const monthField = screen.getByTestId(mockedTestID + '/month');
+        await user.type(monthField, '5');
+
+        const yearField = screen.getByTestId(mockedTestID + '/year');
+        await user.type(yearField, '6');
+
+        await act(() => {
+            DeviceEventEmitter.emit('keyboardDidHide', {});
+        });
+
+        expect(mockOnChange).toHaveBeenCalledWith(expect.any(RangeError));
+    });
+
     it('should display an error message', async () => {
         tree.rerender(
             <DateSelector
diff --git a/src/components/dateSelector/DateSelector.tsx b/src/components/dateSelector/DateSelector.tsx
index 5f97125a..a64ac40b 100644
--- a/src/components/dateSelector/DateSelector.tsx
+++ b/src/components/dateSelector/DateSelector.tsx
@@ -13,7 +13,7 @@ import {
 type DateSelectorProps = WithTestID<{
     prefilled: Date;
     errorMessage?: string;
-    onUpdatedDate: (date: Date) => void;
+    onUpdatedDate: (date: Date | RangeError) => void;
 }>;
 
 interface FieldsValues {
@@ -169,7 +169,14 @@ function fromFieldsToDate(fieldsValues: FieldsValues) {
         parseInt(fieldsValues.monthField),
         2000 + parseInt(fieldsValues.yearField),
     ];
-    return new Date(year, month - 1, day);
+
+    const date = new Date(`${year}-${month}-${day}`);
+
+    if (isNaN(date.getTime())) {
+        return RangeError("Invalid date");
+    }
+
+    return date;
 }
 
 function filledFieldsValues(