diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt
index fb7a6764f..7b5932a5f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/UserObservers.kt
@@ -413,7 +413,12 @@ fun observeUserIsFollowing(
     UserFinderFilterAssemblerSubscription(user1, accountViewModel)
     val isUserInFollowSets =
         remember(accountViewModel.account.followSetsState) {
-            accountViewModel.account.followSetsState.isUserInFollowSets(user2)
+            // Only check follow sets if user1 is the logged-in user
+            if (user1 == accountViewModel.account.userProfile()) {
+                accountViewModel.account.followSetsState.isUserInFollowSets(user2)
+            } else {
+                false
+            }
         }
 
     // Subscribe in the LocalCache for changes that arrive in the device
diff --git a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt
index 80ee7602b..526524f3a 100644
--- a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt
+++ b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/foreground/intents/requests/DecryptZapRequest.kt
@@ -35,7 +35,7 @@ class DecryptZapRequest {
         ): Intent {
             val intent = Intent(Intent.ACTION_VIEW, "nostrsigner:${event.toJson()}".toUri())
             intent.`package` = packageName
-            intent.putExtra("type", CommandType.NIP44_DECRYPT.code)
+            intent.putExtra("type", CommandType.DECRYPT_ZAP_EVENT.code)
             intent.putExtra("current_user", loggedInUser)
             return intent
         }