diff --git a/src/app/CustomPersistGate.tsx b/src/app/CustomPersistGate.tsx
index 208dbb7d..9762955c 100644
--- a/src/app/CustomPersistGate.tsx
+++ b/src/app/CustomPersistGate.tsx
@@ -4,9 +4,10 @@ import { PersistGate } from 'redux-persist/integration/react';
 
 import { persistor } from '../store/store';
 import { selectAllTrackers } from '../store/trackers/trackers.selectors';
+import { setSelectedDate } from '../store/trackers/trackersSlice';
 import isATracker from '../utils/isATracker';
 import FullScreenLoading from './FullScreenLoading';
-import { useAppSelector } from './hooks';
+import { useAppDispatch, useAppSelector } from './hooks';
 
 interface Props {
   children: React.ReactNode;
@@ -15,8 +16,13 @@ interface Props {
 const CustomPersistGate: FC<Props> = ({ children }) => {
   const { trackers } = useAppSelector(selectAllTrackers);
   const navigate = useNavigate();
+  const dispatch = useAppDispatch();
 
   const handleBeforeLift = () => {
+    // Change date to today
+    dispatch(setSelectedDate(new Date().toString()));
+
+    // Check trackers
     for (const tracker of trackers) {
       const data = isATracker(tracker);
       if (data.errors.length !== 0) {
@@ -25,6 +31,8 @@ const CustomPersistGate: FC<Props> = ({ children }) => {
         });
       }
     }
+
+    // Move to the validate trackers page
     if (trackers.length > 0) {
       navigate('/trackers');
     }