diff --git a/src/components/SwapWidget/useSwapWidget.ts b/src/components/SwapWidget/useSwapWidget.ts
index 561b7a3b..6c65d5c7 100644
--- a/src/components/SwapWidget/useSwapWidget.ts
+++ b/src/components/SwapWidget/useSwapWidget.ts
@@ -292,8 +292,10 @@ const useFormValuesStore = create(
     persist(() => defaultValues, {
       name: "SwapWidgetState",
       version: 1,
-      storage: createJSONStorage(() => sessionStorage),
+      storage: createJSONStorage(() => window.sessionStorage),
       partialize: (state): Partial<FormValues> => ({
+        amountIn: state.amountIn,
+        amountOut: state.amountOut,
         sourceChain: state.sourceChain,
         sourceAsset: state.sourceAsset,
         destinationChain: state.destinationChain,