diff --git a/src/state/queries/post.ts b/src/state/queries/post.ts
index a32c4159b3..4024001a90 100644
--- a/src/state/queries/post.ts
+++ b/src/state/queries/post.ts
@@ -19,8 +19,10 @@ export function usePostQuery(uri: string | undefined) {
   const agent = useAgent()
   return useQuery<AppBskyFeedDefs.PostView>({
     queryKey: RQKEY(uri || ''),
-    async queryFn() {
-      const urip = new AtUri(uri!)
+    queryFn: async () => {
+      if (!uri) throw new Error('[unreachable] No URI provided')
+
+      const urip = new AtUri(uri)
 
       if (!urip.host.startsWith('did:')) {
         const res = await agent.resolveHandle({
@@ -158,7 +160,7 @@ export function usePostLikeMutationQueue(
     return queueToggle(false)
   }, [queryClient, postUri, queueToggle])
 
-  return [queueLike, queueUnlike]
+  return [queueLike, queueUnlike] as const
 }
 
 function usePostLikeMutation(
@@ -286,7 +288,7 @@ export function usePostRepostMutationQueue(
     return queueToggle(false)
   }, [queryClient, postUri, queueToggle])
 
-  return [queueRepost, queueUnrepost]
+  return [queueRepost, queueUnrepost] as const
 }
 
 function usePostRepostMutation(
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index 3dcfc46f58..d3f6e92dbf 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -360,7 +360,7 @@ export function useProfileFollowMutationQueue(
     return queueToggle(false)
   }, [queryClient, did, queueToggle])
 
-  return [queueFollow, queueUnfollow]
+  return [queueFollow, queueUnfollow] as const
 }
 
 function useProfileFollowMutation(
@@ -460,7 +460,7 @@ export function useProfileMuteMutationQueue(
     return queueToggle(false)
   }, [queryClient, did, queueToggle])
 
-  return [queueMute, queueUnmute]
+  return [queueMute, queueUnmute] as const
 }
 
 function useProfileMuteMutation() {
@@ -541,7 +541,7 @@ export function useProfileBlockMutationQueue(
     return queueToggle(false)
   }, [queryClient, did, queueToggle])
 
-  return [queueBlock, queueUnblock]
+  return [queueBlock, queueUnblock] as const
 }
 
 function useProfileBlockMutation() {