diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index dbf14937f..e34d90995 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -508,7 +508,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
           } 
 
           shapeshiftService.shiftIt(vm.originWallet.coin, toWallet.coin, withdrawalAddr, returnAddr, function onShiftIt(err, shapeshiftData) {
-            if (err && err != null) {
+            if (err) {
               ongoingProcess.set('connectingShapeshift', false);
               popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.toString(), function () {
                 $ionicHistory.goBack();
diff --git a/src/js/services/shapeshift.service.js b/src/js/services/shapeshift.service.js
index 7c1896ac7..1efabffd4 100644
--- a/src/js/services/shapeshift.service.js
+++ b/src/js/services/shapeshift.service.js
@@ -32,7 +32,6 @@ angular.module('bitcoincom.services').factory('shapeshiftService', function ($ht
   };
 
   root.shiftIt = function (coinIn, coinOut, withdrawalAddress, returnAddress, cb) {
-    ongoingProcess.set('connectingShapeshift', true);
     root.withdrawalAddress = withdrawalAddress;
     root.returnAddress = returnAddress;
     root.coinIn = coinIn;