diff --git a/src/hooks/nostr/useSigner.ts b/src/hooks/nostr/useSigner.ts
index 13eed0f72..8541a2430 100644
--- a/src/hooks/nostr/useSigner.ts
+++ b/src/hooks/nostr/useSigner.ts
@@ -1,4 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
+import { useMemo } from 'react';
 
 import { keyring } from 'soapbox/features/nostr/keyring';
 import { useAppSelector } from 'soapbox/hooks';
@@ -33,9 +34,15 @@ export function useSigner() {
     enabled: !!pubkey,
   });
 
+  const bunkerSigner = useMemo(() => {
+    if (bunkerPubkey) {
+      return keyring.get(bunkerPubkey);
+    }
+  }, [bunkerPubkey]);
+
   return {
     signer: signer ?? undefined,
-    bunkerSigner: bunkerPubkey ? keyring.get(bunkerPubkey) : undefined,
+    bunkerSigner,
     authorizedPubkey,
     ...rest,
   };