diff --git a/src/app/core/persistence/persistence.service.ts b/src/app/core/persistence/persistence.service.ts
index 726148077c..62e05ba811 100644
--- a/src/app/core/persistence/persistence.service.ts
+++ b/src/app/core/persistence/persistence.service.ts
@@ -303,9 +303,8 @@ export class PersistenceService {
     ])
       .then(() => {
         this.updateLastLocalSyncModelChange(data.lastLocalSyncModelChange);
-        this._isBlockSaving = false;
       })
-      .catch(() => {
+      .finally(() => {
         this._isBlockSaving = false;
       });
   }
diff --git a/src/app/core/snack/snack-custom/snack-custom.component.ts b/src/app/core/snack/snack-custom/snack-custom.component.ts
index 43ff18fec5..ccdcecd2d5 100644
--- a/src/app/core/snack/snack-custom/snack-custom.component.ts
+++ b/src/app/core/snack/snack-custom/snack-custom.component.ts
@@ -21,9 +21,7 @@ export class SnackCustomComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     if (this.data.promise) {
-      this.data.promise.then(() => {
-        this.snackBarRef.dismiss();
-      }).catch(() => {
+      this.data.promise.finally(() => {
         this.snackBarRef.dismiss();
       });
     }