diff --git a/src/screens/AddTransactionScreen.tsx b/src/screens/AddTransactionScreen.tsx
index ed7f3e6..04696ca 100644
--- a/src/screens/AddTransactionScreen.tsx
+++ b/src/screens/AddTransactionScreen.tsx
@@ -205,10 +205,11 @@ export function AddTransactionScreen() {
             value={occurredAt}
             mode="date"
             maximumDate={new Date()}
-            onChange={(e, d) => {
+            onValueChange={(e, d) => {
               setShowDate(false);
               if (d) setOccurredAt(d);
             }}
+            onDismiss={() => setShowDate(false)}
           />
         )}
 
diff --git a/src/screens/EditTransactionScreen.tsx b/src/screens/EditTransactionScreen.tsx
index 6050b1b..5735c7b 100644
--- a/src/screens/EditTransactionScreen.tsx
+++ b/src/screens/EditTransactionScreen.tsx
@@ -200,10 +200,11 @@ export function EditTransactionScreen() {
             value={occurredAt}
             mode="date"
             maximumDate={new Date()}
-            onChange={(e, d) => {
+            onValueChange={(e, d) => {
               setShowDate(false);
               if (d) setOccurredAt(d);
             }}
+            onDismiss={() => setShowDate(false)}
           />
         )}