diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
index 4d7ab89c54..234325e738 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
@@ -161,7 +161,7 @@ class Amethyst : Application() {
         AccountCacheState(
             geolocationFlow = locationManager.geohashStateFlow,
             nwcFilterAssembler = sources.nwc,
-            contentResolver = contentResolver,
+            contentResolverFn = ::contentResolverFn,
             cache = cache,
             client = client,
         )
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt
index 206c4a57f6..8b02116364 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/accountsCache/AccountCacheState.kt
@@ -44,7 +44,7 @@ import kotlinx.coroutines.flow.StateFlow
 class AccountCacheState(
     val geolocationFlow: StateFlow<LocationState.LocationResult>,
     val nwcFilterAssembler: NWCPaymentFilterAssembler,
-    val contentResolver: ContentResolver,
+    val contentResolverFn: () -> ContentResolver,
     val cache: LocalCache,
     val client: INostrClient,
 ) {
@@ -75,7 +75,7 @@ class AccountCacheState(
                             NostrSignerExternal(
                                 pubKey = accountSettings.keyPair.pubKey.toHexKey(),
                                 packageName = packageName,
-                                contentResolver = contentResolver,
+                                contentResolver = contentResolverFn(),
                             )
                     }
                 },