diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index 9fcb91230..8d85658ca 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -130,6 +130,9 @@ public abstract class DataStorage {
     }
 
     private void dispose() {
+        getStoreEntries().forEach(entry -> {
+            entry.finalizeEntry();
+        });
         save(true);
     }
 
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
index 6ba592503..73b1d9182 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
@@ -581,7 +581,6 @@ public class DataStoreEntry extends StorageElement {
         notifyUpdate(false, false);
     }
 
-    @SneakyThrows
     public void initializeEntry() {
         if (store instanceof ExpandedLifecycleStore lifecycleStore) {
             try {
@@ -597,7 +596,6 @@ public class DataStoreEntry extends StorageElement {
         }
     }
 
-    @SneakyThrows
     public void finalizeEntry() {
         if (store instanceof ExpandedLifecycleStore lifecycleStore) {
             try {