diff --git a/my-expo-app/components/CardioTracker.tsx b/my-expo-app/components/CardioTracker.tsx
index d67b3f13..91178afd 100644
--- a/my-expo-app/components/CardioTracker.tsx
+++ b/my-expo-app/components/CardioTracker.tsx
@@ -83,12 +83,12 @@ const CardioTracker = () => {
         return `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
     };
 
-    const onAddDateChange = (_event: DateTimePickerEvent, date?: Date) => {
+    const onAddDateChange = (event: DateTimePickerEvent, date?: Date) => {
         if (Platform.OS === 'android') {
             setShowAddDatePicker(false);
         }
 
-        if (date) {
+        if (event.type === 'set' && date) {
             setSelectedDateTime((prevDateTime) => {
                 const nextDateTime = new Date(prevDateTime);
                 nextDateTime.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
@@ -97,12 +97,12 @@ const CardioTracker = () => {
         }
     };
 
-    const onAddTimeChange = (_event: DateTimePickerEvent, date?: Date) => {
+    const onAddTimeChange = (event: DateTimePickerEvent, date?: Date) => {
         if (Platform.OS === 'android') {
             setShowAddTimePicker(false);
         }
 
-        if (date) {
+        if (event.type === 'set' && date) {
             setSelectedDateTime((prevDateTime) => {
                 const nextDateTime = new Date(prevDateTime);
                 nextDateTime.setHours(date.getHours(), date.getMinutes(), 0, 0);
@@ -111,12 +111,12 @@ const CardioTracker = () => {
         }
     };
 
-    const onEditDateChange = (_event: DateTimePickerEvent, date?: Date) => {
+    const onEditDateChange = (event: DateTimePickerEvent, date?: Date) => {
         if (Platform.OS === 'android') {
             setShowEditDatePicker(false);
         }
 
-        if (date) {
+        if (event.type === 'set' && date) {
             setEditDateTime((prevDateTime) => {
                 const nextDateTime = new Date(prevDateTime);
                 nextDateTime.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
@@ -125,12 +125,12 @@ const CardioTracker = () => {
         }
     };
 
-    const onEditTimeChange = (_event: DateTimePickerEvent, date?: Date) => {
+    const onEditTimeChange = (event: DateTimePickerEvent, date?: Date) => {
         if (Platform.OS === 'android') {
             setShowEditTimePicker(false);
         }
 
-        if (date) {
+        if (event.type === 'set' && date) {
             setEditDateTime((prevDateTime) => {
                 const nextDateTime = new Date(prevDateTime);
                 nextDateTime.setHours(date.getHours(), date.getMinutes(), 0, 0);
diff --git a/my-expo-app/components/InputWorkout.tsx b/my-expo-app/components/InputWorkout.tsx
index 08d002be..cd8caad7 100644
--- a/my-expo-app/components/InputWorkout.tsx
+++ b/my-expo-app/components/InputWorkout.tsx
@@ -217,12 +217,12 @@ const InputWorkout = () => {
         };
     }
 
-    const onAddDateChange = (_event: DateTimePickerEvent, date?: Date) => {
+    const onAddDateChange = (event: DateTimePickerEvent, date?: Date) => {
         if (Platform.OS === 'android') {
             setShowAddDatePicker(false);
         }
 
-        if (date) {
+        if (event.type === 'set' && date) {
             setSelectedDateTime((prevDateTime) => {
                 const nextDateTime = new Date(prevDateTime);
                 nextDateTime.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
@@ -231,12 +231,12 @@ const InputWorkout = () => {
         }
     };
 
-    const onAddTimeChange = (_event: DateTimePickerEvent, date?: Date) => {
+    const onAddTimeChange = (event: DateTimePickerEvent, date?: Date) => {
         if (Platform.OS === 'android') {
             setShowAddTimePicker(false);
         }
 
-        if (date) {
+        if (event.type === 'set' && date) {
             setSelectedDateTime((prevDateTime) => {
                 const nextDateTime = new Date(prevDateTime);
                 nextDateTime.setHours(date.getHours(), date.getMinutes(), 0, 0);
@@ -245,12 +245,12 @@ const InputWorkout = () => {
         }
     };
 
-    const onEditDateChange = (_event: DateTimePickerEvent, date?: Date) => {
+    const onEditDateChange = (event: DateTimePickerEvent, date?: Date) => {
         if (Platform.OS === 'android') {
             setShowEditDatePicker(false);
         }
 
-        if (date) {
+        if (event.type === 'set' && date) {
             setEditDateTime((prevDateTime) => {
                 const nextDateTime = new Date(prevDateTime);
                 nextDateTime.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
@@ -259,12 +259,12 @@ const InputWorkout = () => {
         }
     };
 
-    const onEditTimeChange = (_event: DateTimePickerEvent, date?: Date) => {
+    const onEditTimeChange = (event: DateTimePickerEvent, date?: Date) => {
         if (Platform.OS === 'android') {
             setShowEditTimePicker(false);
         }
 
-        if (date) {
+        if (event.type === 'set' && date) {
             setEditDateTime((prevDateTime) => {
                 const nextDateTime = new Date(prevDateTime);
                 nextDateTime.setHours(date.getHours(), date.getMinutes(), 0, 0);