diff --git a/src/services/service.ts b/src/services/service.ts
index f0e925c..2416d3a 100755
--- a/src/services/service.ts
+++ b/src/services/service.ts
@@ -993,7 +993,20 @@ export default class Services {
       // This is existing device, we need to catch up if last_scan is lagging behind chain_tip
       if (device.sp_wallet.last_scan < this.currentBlockHeight) {
         // We need to catch up
-        await this.sdkClient.scan_blocks(this.currentBlockHeight, BLINDBITURL);
+        try {
+          await this.sdkClient.scan_blocks(this.currentBlockHeight, BLINDBITURL);
+        } catch (e) {
+          console.error(`Failed to scan blocks: ${e}`);
+          return;
+        }
+
+        // If everything went well, we can update our storage
+        try {
+          const device = this.dumpDeviceFromMemory();
+          await this.saveDeviceInDatabase(device);
+        } catch (e) {
+          console.error(`Failed to save updated device: ${e}`);
+        }
       } else {
         // Up to date, just returns
         return;