diff --git a/packages/app/src/handles.ts b/packages/app/src/handles.ts
index 34944e2..cf85f51 100644
--- a/packages/app/src/handles.ts
+++ b/packages/app/src/handles.ts
@@ -114,7 +114,11 @@ export const deriveHandleForPubkey = (pubkey: string, relays: string[] = []) =>
 
     loadHandle($profile.nip05)
 
-    return $handlesByNip05.get($profile.nip05)
+    const handle = $handlesByNip05.get($profile.nip05)
+
+    if (handle?.pubkey === pubkey) {
+      return handle
+    }
   })
 
 export const displayNip05 = (nip05: string) =>
diff --git a/packages/util/src/Kinds.ts b/packages/util/src/Kinds.ts
index 4749cf1..a295303 100644
--- a/packages/util/src/Kinds.ts
+++ b/packages/util/src/Kinds.ts
@@ -187,6 +187,7 @@ export const COMMUNITY = 34550
 export const ROOM = 35834
 export const ROOM_META = 39000
 export const ROOM_ADMINS = 39001
+export const FOLLOW_PACK = 39089
 
 export const DEPRECATED_RELAY_RECOMMENDATION = 2
 export const DEPRECATED_DIRECT_MESSAGE = 4