diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
index 8b6a5f39382..61e82b69ea2 100644
--- a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
@@ -60,7 +60,6 @@
     let visibleSurplus: number | undefined = undefined
 
     let isPreparingOutput = false
-
     $: expirationTimePicker?.setNull(giftStorageDeposit)
 
     $: isBaseTokenTransfer =
diff --git a/packages/shared/components/ExpirationTimePicker.svelte b/packages/shared/components/ExpirationTimePicker.svelte
index 7a5edd47f66..a86e0f5be2a 100644
--- a/packages/shared/components/ExpirationTimePicker.svelte
+++ b/packages/shared/components/ExpirationTimePicker.svelte
@@ -14,8 +14,11 @@
         if (bool && value) {
             storedValue = value
             value = null
+            previouslySelectedPeriod = selectedTimePeriod
+            selectedTimePeriod = TimePeriod.None
         } else {
             value = storedValue ?? value
+            selectedTimePeriod = previouslySelectedPeriod
         }
     }