diff --git a/src/js/controllers/buyCoinbase.js b/src/js/controllers/buyCoinbase.js
index 5004529cd..c846be872 100644
--- a/src/js/controllers/buyCoinbase.js
+++ b/src/js/controllers/buyCoinbase.js
@@ -151,10 +151,10 @@ angular.module('copayApp.controllers').controller('buyCoinbaseController',
                 self.error = {errors: [{ message: 'Could not create address' }]};
                 return;
               }
-              coinbaseService.savePendingTransaction(updatedTx.data, {toAddr: addr}, function(err) {
+              updatedTx.data['toAddr'] = addr;
+              coinbaseService.savePendingTransaction(updatedTx.data, {}, function(err) {
                 self.loading = null;
                 if (err) $log.debug(err);
-                updatedTx.data['toAddr'] = addr;
                 if (updatedTx.data.status == 'completed') {
                   self.sendToCopay(token, account, updatedTx.data);
                 } else {
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 902f5b795..65b6707ec 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1390,8 +1390,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
                 });
               }
             });
-          } else if (tx.data.type == 'buy' && tx.data.status == 'pending' && tx.data.buy) {
-            self.buyPending(tx.data);
+          } else if (tx.data.type == 'buy' && tx.data.status == 'completed' && tx.data.buy) {
+            self.sendToCopay(dataFromStorage);
           } else {
             coinbaseService.savePendingTransaction(dataFromStorage, {}, function(err) {
               if (err) $log.debug(err);
@@ -1435,7 +1435,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
-  self.buyPending = function(tx) {
+  self.sendToCopay = function(tx) {
     if (!tx) return;
     var data = {
       to: tx.toAddr,