diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index f10121ee6..c54145947 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -38,9 +38,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
       $scope.minShapeshiftAmount = parseFloat(data.stateParams.minShapeshiftAmount);
       $scope.maxShapeshiftAmount = parseFloat(data.stateParams.maxShapeshiftAmount);
       $scope.shapeshiftOrderId = data.stateParams.shapeshiftOrderId;
-      $scope.fromWalletId = data.stateParams.fromWalletId;
     }
 
+    // To get the wallet from with the new flow
+    $scope.fromWalletId = data.stateParams.fromWalletId;
+
     if (data.stateParams.noPrefix) {
       $scope.showWarningMessage = data.stateParams.noPrefix != 0;
       if ($scope.showWarningMessage) {
@@ -458,7 +460,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
           amount: $scope.useSendMax ? null : _amount,
           currency: unit.id.toUpperCase(),
           coin: coin,
-          useSendMax: $scope.useSendMax
+          useSendMax: $scope.useSendMax,
+          fromWalletId: $scope.fromWalletId || undefined
         });
       } else {
         var amount = _amount;
@@ -479,6 +482,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
           toColor: $scope.toColor,
           coin: coin,
           useSendMax: $scope.useSendMax,
+          fromWalletId: $scope.fromWalletId || undefined
         };
 
         if ($scope.shapeshiftOrderId) {
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index da9414d05..99265457d 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
         return $state.transitionTo('tabs.send.amount', {
           displayAddress: $scope.walletToWalletFrom.coin === 'bch' ? bitcoinCashJsService.translateAddresses(addr).cashaddr : addr,
           recipientType: 'wallet',
-          fromWalletId: $scope.walletToWalletFrom.walletId,
+          fromWalletId: $scope.walletToWalletFrom.id,
           toAddress: addr,
           coin: $scope.walletToWalletFrom.coin
         });