diff --git a/src/actions/nostr.ts b/src/actions/nostr.ts
index 8afc2abec..d58bc571a 100644
--- a/src/actions/nostr.ts
+++ b/src/actions/nostr.ts
@@ -2,7 +2,7 @@ import { NostrSigner, NRelay1, NSecSigner } from '@nostrify/nostrify';
 import { generateSecretKey } from 'nostr-tools';
 
 import { NostrRPC } from 'soapbox/features/nostr/NostrRPC';
-import { useBunkerStore } from 'soapbox/hooks/useBunkerStore';
+import { useBunkerStore } from 'soapbox/hooks/nostr/useBunkerStore';
 import { type AppDispatch } from 'soapbox/store';
 
 import { authLoggedIn, verifyCredentials } from './auth';
diff --git a/src/contexts/nostr-context.tsx b/src/contexts/nostr-context.tsx
index 2fec40a06..7230daf60 100644
--- a/src/contexts/nostr-context.tsx
+++ b/src/contexts/nostr-context.tsx
@@ -1,7 +1,7 @@
 import { NRelay1, NostrSigner } from '@nostrify/nostrify';
 import React, { createContext, useContext, useState, useEffect } from 'react';
 
-import { useSigner } from 'soapbox/api/hooks/nostr/useSigner';
+import { useSigner } from 'soapbox/hooks/nostr/useSigner';
 import { useInstance } from 'soapbox/hooks/useInstance';
 
 interface NostrContextType {
diff --git a/src/api/hooks/nostr/useBunker.ts b/src/hooks/nostr/useBunker.ts
similarity index 92%
rename from src/api/hooks/nostr/useBunker.ts
rename to src/hooks/nostr/useBunker.ts
index 2b9249e3b..6cb7058ca 100644
--- a/src/api/hooks/nostr/useBunker.ts
+++ b/src/hooks/nostr/useBunker.ts
@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 
-import { useSigner } from 'soapbox/api/hooks/nostr/useSigner';
 import { useNostr } from 'soapbox/contexts/nostr-context';
 import { NBunker } from 'soapbox/features/nostr/NBunker';
+import { useSigner } from 'soapbox/hooks/nostr/useSigner';
 
 function useBunker() {
   const { relay } = useNostr();
diff --git a/src/hooks/useBunkerStore.ts b/src/hooks/nostr/useBunkerStore.ts
similarity index 100%
rename from src/hooks/useBunkerStore.ts
rename to src/hooks/nostr/useBunkerStore.ts
diff --git a/src/api/hooks/nostr/useSigner.ts b/src/hooks/nostr/useSigner.ts
similarity index 94%
rename from src/api/hooks/nostr/useSigner.ts
rename to src/hooks/nostr/useSigner.ts
index 22aadae1d..a91422006 100644
--- a/src/api/hooks/nostr/useSigner.ts
+++ b/src/hooks/nostr/useSigner.ts
@@ -4,7 +4,7 @@ import { useMemo } from 'react';
 
 import { NKeys } from 'soapbox/features/nostr/keys';
 import { useAppSelector } from 'soapbox/hooks';
-import { useBunkerStore } from 'soapbox/hooks/useBunkerStore';
+import { useBunkerStore } from 'soapbox/hooks/nostr/useBunkerStore';
 
 export function useSigner() {
   const { connections } = useBunkerStore();
diff --git a/src/init/soapbox-load.tsx b/src/init/soapbox-load.tsx
index 922ddd463..7ad79e5a0 100644
--- a/src/init/soapbox-load.tsx
+++ b/src/init/soapbox-load.tsx
@@ -3,8 +3,6 @@ import { IntlProvider } from 'react-intl';
 
 import { fetchMe } from 'soapbox/actions/me';
 import { loadSoapboxConfig } from 'soapbox/actions/soapbox';
-import { useBunker } from 'soapbox/api/hooks/nostr/useBunker';
-import { useSigner } from 'soapbox/api/hooks/nostr/useSigner';
 import LoadingScreen from 'soapbox/components/loading-screen';
 import { useNostr } from 'soapbox/contexts/nostr-context';
 import {
@@ -14,6 +12,8 @@ import {
   useLocale,
   useInstance,
 } from 'soapbox/hooks';
+import { useBunker } from 'soapbox/hooks/nostr/useBunker';
+import { useSigner } from 'soapbox/hooks/nostr/useSigner';
 import MESSAGES from 'soapbox/messages';
 
 /** Load initial data from the backend */