diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index 7d30f4685..d04aef6ae 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -53,12 +53,9 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
         if (err) {
           self.error = err.message || err;
         } else {
-          storageService.removeTxHistory(fc.credentials.walletId, function() {
-            notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {
-              walletName: walletName
-            }));
-            return;
-          });
+          notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {
+            walletName: walletName
+          }));
         }
       });
     };
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 2aa15cd6c..0170aebfe 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -303,16 +303,29 @@ angular.module('copayApp.services')
 
     root.deleteWalletFC = function(opts, cb) {
       var fc = root.focusedClient;
+      var walletId = fc.credentials.walletId;
       $log.debug('Deleting Wallet:', fc.credentials.walletName);
 
       fc.removeAllListeners();
       root.profile.credentials = lodash.reject(root.profile.credentials, {
-        walletId: fc.credentials.walletId
+        walletId: walletId
       });
 
-      delete root.walletClients[fc.credentials.walletId];
+      delete root.walletClients[walletId]; 
       root.focusedClient = null;
 
+      storageService.clearLastAddress(walletId, function(err) {
+        if (err) $log.warn(err);
+      });
+
+      storageService.removeTxHistory(walletId, function(err) {
+        if (err) $log.warn(err);
+      });
+
+      storageService.clearBackupFlag(walletId, function(err) {
+        if (err) $log.warn(err);
+      });
+
       $timeout(function() {
         root.setWalletClients();
         root.setAndStoreFocus(null, function() {
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 851ea860e..46495589c 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -159,6 +159,10 @@ angular.module('copayApp.services')
       storage.get('backup-' + walletId, cb);
     };
 
+    root.clearBackupFlag = function(walletId, cb) {
+      storage.remove('backup-' + walletId, cb);
+    };
+
     root.setCleanAndScanAddresses = function(walletId, cb) {
       storage.set('CleanAndScanAddresses', walletId, cb);
     };