diff --git a/web-wallet/CHANGELOG.md b/web-wallet/CHANGELOG.md
index 958c73698..8223801d5 100644
--- a/web-wallet/CHANGELOG.md
+++ b/web-wallet/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix edge case in Dusk to Lux conversion [#3032]
 - Fix inconsistent terminology usage for "Mnemonic Phrase" [#3035]
 - Fix auto-sync not working after restoring a wallet [#3042]
+- Fix application crash on empty amount (Stake Flow) [#3036]
 
 ## [0.8.0] - 2024-11-19
 
@@ -370,6 +371,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#3028]: https://github.com/dusk-network/rusk/issues/3028
 [#3032]: https://github.com/dusk-network/rusk/issues/3032
 [#3035]: https://github.com/dusk-network/rusk/issues/3035
+[#3036]: https://github.com/dusk-network/rusk/issues/3036
 [#3042]: https://github.com/dusk-network/rusk/issues/3042
 
 <!-- VERSIONS -->
diff --git a/web-wallet/src/lib/components/Stake/Stake.svelte b/web-wallet/src/lib/components/Stake/Stake.svelte
index 642737ad8..6b844680a 100644
--- a/web-wallet/src/lib/components/Stake/Stake.svelte
+++ b/web-wallet/src/lib/components/Stake/Stake.svelte
@@ -176,7 +176,7 @@
     maxSpendable > 0n && minAllowedStake > maxSpendable
       ? maxSpendable
       : minAllowedStake;
-  $: stakeAmountInLux = duskToLux(stakeAmount);
+  $: stakeAmountInLux = stakeAmount ? duskToLux(stakeAmount) : 0n;
   $: isStakeAmountValid =
     stakeAmountInLux >= minStake && stakeAmountInLux <= maxSpendable;
   $: totalLuxFee = fee + stakeAmountInLux;