diff --git a/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt b/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt
index 6fd7da4d..e0eca747 100644
--- a/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt
+++ b/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt
@@ -133,9 +133,7 @@ fun SelectedWalletScreen(
         } ?: usdAmount
     val unsignedTransactions = manager?.unsignedTransactions ?: emptyList()
 
-    // clear SendFlowManager when returning to wallet screen (matches iOS SelectedWalletScreen)
     LaunchedEffect(manager) {
-        app?.clearSendFlowManager()
         manager?.validateMetadata()
     }
 
diff --git a/android/app/src/main/java/org/bitcoinppl/cove/flows/SendFlow/SendFlowContainer.kt b/android/app/src/main/java/org/bitcoinppl/cove/flows/SendFlow/SendFlowContainer.kt
index 6cca3eb8..76ffd8e8 100644
--- a/android/app/src/main/java/org/bitcoinppl/cove/flows/SendFlow/SendFlowContainer.kt
+++ b/android/app/src/main/java/org/bitcoinppl/cove/flows/SendFlow/SendFlowContainer.kt
@@ -104,6 +104,7 @@ fun SendFlowContainer(
     DisposableEffect(walletId) {
         onDispose {
             sendFlowManager?.presenter?.setDisappearing()
+            app.clearSendFlowManager()
         }
     }