diff --git a/src/components/ComposerV2/store/__tests__/media.test.ts b/src/components/ComposerV2/store/__tests__/media.test.ts
index a395256ef7..d5210d632a 100644
--- a/src/components/ComposerV2/store/__tests__/media.test.ts
+++ b/src/components/ComposerV2/store/__tests__/media.test.ts
@@ -11,12 +11,12 @@ jest.mock('#/state/session/agent', () => ({
 }))
 
 import {type resolveLink} from '#/lib/api/resolve'
-import {type Gif} from '#/state/queries/tenor'
 import {createThreadStore} from '#/components/ComposerV2/store'
 import {
   type AddMediaInput,
   type PostEmbedMedia,
 } from '#/components/ComposerV2/store/types'
+import {type Gif} from '#/features/gifPicker/types'
 
 function makeIdGenerator() {
   let i = 0
@@ -73,7 +73,7 @@ function makeStore() {
   return createThreadStore({
     agent,
     __createId: makeIdGenerator(),
-    __resolveLink: mockResolveLink as unknown as typeof resolveLink,
+    __resolveLink: mockResolveLink,
   })
 }
 
diff --git a/src/components/ComposerV2/store/types.ts b/src/components/ComposerV2/store/types.ts
index d99d55ce6d..810f33fbac 100644
--- a/src/components/ComposerV2/store/types.ts
+++ b/src/components/ComposerV2/store/types.ts
@@ -6,7 +6,7 @@ import {
 } from '@atproto/api'
 
 import {type ComposerImage} from '#/state/gallery'
-import {type Gif} from '#/state/queries/tenor'
+import {type Gif} from '#/features/gifPicker/types'
 
 /**
  * What an upload reporter (the worker, or a test) sends in. Failed inputs