diff --git a/eslint.config.mjs b/eslint.config.mjs
index 1ddcdfdf6..93715971c 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -37,6 +37,7 @@ export default defineConfig(
       '*.e2e.ts',
       '*.e2e.tsx',
       'eslint.config.mjs',
+      'svgo.config.mjs',
       '.jscodeshift/**',
       'rspack.config.ts',
       'scripts/post-web-build.js',
diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx
index 758764dd7..2a5664543 100644
--- a/src/components/ProfileHoverCard/index.web.tsx
+++ b/src/components/ProfileHoverCard/index.web.tsx
@@ -528,8 +528,8 @@ function Inner({
           ))}
       </View>
 
-      <Link to={profileURL} label={_(msg`View profile`)} onPress={hide}>
-        <View style={[a.pb_sm, a.flex_1]}>
+      <View style={[a.pb_sm, a.flex_1]}>
+        <Link to={profileURL} label={_(msg`View profile`)} onPress={hide}>
           <View style={[a.flex_row, a.align_center, a.pt_md, a.pb_xs]}>
             <Text
               numberOfLines={1}
@@ -556,10 +556,14 @@ function Inner({
               ]}
             />
           </View>
+        </Link>
 
-          <ProfileHeaderHandle profile={profileShadow} disableTaps />
-        </View>
-      </Link>
+        <ProfileHeaderHandle
+          profile={profileShadow}
+          disableAuxiliaryTaps
+          onLinkPress={hide}
+        />
+      </View>
 
       {isBlockedUser && (
         <View style={[a.flex_row, a.flex_wrap, a.gap_xs]}>
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 90604169a..d0f1aa68f 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -251,3 +251,5 @@ export const webLinks = {
   community: `https://bsky.social/about/support/community-guidelines`,
   communityDeprecated: `https://bsky.social/about/support/community-guidelines-deprecated`,
 }
+
+export const DOH_ENDPOINT = 'https://cloudflare-dns.com/dns-query'
diff --git a/src/screens/Profile/Header/Handle.tsx b/src/screens/Profile/Header/Handle.tsx
index 967327b5d..67e02383a 100644
--- a/src/screens/Profile/Header/Handle.tsx
+++ b/src/screens/Profile/Header/Handle.tsx
@@ -1,4 +1,4 @@
-import {View} from 'react-native'
+import {type GestureResponderEvent, View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
@@ -9,6 +9,8 @@ import {sanitizePronouns} from '#/lib/strings/pronouns'
 import {type Shadow} from '#/state/cache/types'
 import {useShowFollowsYouBadge} from '#/state/preferences/show-follows-you-badge'
 import {useShowLinkInHandle} from '#/state/preferences/show-link-in-handle.tsx'
+import {useShowLinkInHandleOnlyOnWorkingLinks} from '#/state/preferences/show-link-in-handle-only-on-working-links'
+import {useHandleLinkQuery} from '#/state/queries/handle-link'
 import {atoms as a, useTheme, web} from '#/alf'
 import {InlineLinkText} from '#/components/Link.tsx'
 import {NewskieDialog} from '#/components/NewskieDialog'
@@ -18,9 +20,13 @@ import {IS_IOS, IS_NATIVE} from '#/env'
 export function ProfileHeaderHandle({
   profile,
   disableTaps,
+  disableAuxiliaryTaps,
+  onLinkPress,
 }: {
   profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
   disableTaps?: boolean
+  disableAuxiliaryTaps?: boolean
+  onLinkPress?: (e: GestureResponderEvent) => void | false
 }) {
   const t = useTheme()
   const {_} = useLingui()
@@ -30,17 +36,50 @@ export function ProfileHeaderHandle({
   const isBskySocialHandle = profile.handle.endsWith('.bsky.social')
   const showFollowsYouBadge = useShowFollowsYouBadge()
   const showProfileInHandle = useShowLinkInHandle()
+  const showLinkInHandleOnlyOnWorkingLinks =
+    useShowLinkInHandleOnlyOnWorkingLinks()
+  const shouldCheckHandleLink =
+    showProfileInHandle &&
+    showLinkInHandleOnlyOnWorkingLinks &&
+    !invalidHandle &&
+    !isBskySocialHandle
+  const {data: hasWorkingHandleLink = false} = useHandleLinkQuery(
+    profile.handle,
+    shouldCheckHandleLink,
+  )
+  const shouldShowProfileLink =
+    showProfileInHandle &&
+    !isBskySocialHandle &&
+    (!showLinkInHandleOnlyOnWorkingLinks || hasWorkingHandleLink)
+  const disableNewskieDialog = disableTaps || disableAuxiliaryTaps
   const sanitized = sanitizeHandle(
     profile.handle,
     '@',
     // forceLTR handled by CSS above on web
     IS_NATIVE,
   )
+  const handleTextStyle = [
+    invalidHandle
+      ? [
+          a.border,
+          a.text_xs,
+          a.px_sm,
+          a.py_xs,
+          a.rounded_xs,
+          {borderColor: t.palette.contrast_200},
+        ]
+      : [a.text_md, a.leading_tight, t.atoms.text_contrast_medium],
+    web({
+      wordBreak: 'break-all',
+      direction: 'ltr',
+      unicodeBidi: 'isolate',
+    }),
+  ]
   return (
     <View
       style={[a.flex_row, a.gap_sm, a.align_center, {maxWidth: '100%'}]}
       pointerEvents={disableTaps ? 'none' : IS_IOS ? 'auto' : 'box-none'}>
-      <NewskieDialog profile={profile} disabled={disableTaps} />
+      <NewskieDialog profile={profile} disabled={disableNewskieDialog} />
       {showFollowsYouBadge && profile.viewer?.followedBy && !blockHide ? (
         <View style={[t.atoms.bg_contrast_50, a.rounded_xs, a.px_sm, a.py_xs]}>
           <Text style={[t.atoms.text, a.text_sm]}>
@@ -49,40 +88,24 @@ export function ProfileHeaderHandle({
         </View>
       ) : undefined}
       <View style={[a.flex_row, a.flex_wrap, {gap: 6}]}>
-        <Text
-          emoji
-          numberOfLines={1}
-          style={[
-            invalidHandle
-              ? [
-                  a.border,
-                  a.text_xs,
-                  a.px_sm,
-                  a.py_xs,
-                  a.rounded_xs,
-                  {borderColor: t.palette.contrast_200},
-                ]
-              : [a.text_md, a.leading_tight, t.atoms.text_contrast_medium],
-            web({
-              wordBreak: 'break-all',
-              direction: 'ltr',
-              unicodeBidi: 'isolate',
-            }),
-          ]}>
-          {invalidHandle ? (
-            _(msg`⚠Invalid Handle`)
-          ) : showProfileInHandle && !isBskySocialHandle ? (
-            <InlineLinkText
-              to={`https://${profile.handle}`}
-              label={profile.handle}>
-              <Text style={[a.text_md, {color: t.palette.primary_500}]}>
-                {sanitized}
-              </Text>
-            </InlineLinkText>
-          ) : (
-            sanitized
-          )}
-        </Text>
+        {invalidHandle ? (
+          <Text emoji numberOfLines={1} style={handleTextStyle}>
+            {_(msg`⚠Invalid Handle`)}
+          </Text>
+        ) : shouldShowProfileLink ? (
+          <InlineLinkText
+            to={`https://${profile.handle}`}
+            label={profile.handle}
+            numberOfLines={1}
+            style={[a.text_md, a.leading_tight, web({direction: 'ltr'})]}
+            onPress={onLinkPress}>
+            {sanitized}
+          </InlineLinkText>
+        ) : (
+          <Text emoji numberOfLines={1} style={handleTextStyle}>
+            {sanitized}
+          </Text>
+        )}
         {pronouns && (
           <Text style={[t.atoms.text_contrast_low, a.text_md, a.leading_tight]}>
             {sanitizePronouns(pronouns, IS_NATIVE)}
diff --git a/src/screens/Settings/RunesSettings.tsx b/src/screens/Settings/RunesSettings.tsx
index f4feb8b87..fad7bcb7a 100644
--- a/src/screens/Settings/RunesSettings.tsx
+++ b/src/screens/Settings/RunesSettings.tsx
@@ -156,6 +156,10 @@ import {
   useSetShowLinkInHandle,
   useShowLinkInHandle,
 } from '#/state/preferences/show-link-in-handle.tsx'
+import {
+  useSetShowLinkInHandleOnlyOnWorkingLinks,
+  useShowLinkInHandleOnlyOnWorkingLinks,
+} from '#/state/preferences/show-link-in-handle-only-on-working-links'
 import {
   useLibreTranslateInstance,
   useSetLibreTranslateInstance,
@@ -256,7 +260,7 @@ function ConstellationInstanceDialog({
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color="primary"
               disabled={shouldDisable()}>
@@ -388,7 +392,7 @@ function CustomAppViewDidDialog({
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color={did.length > 0 ? 'primary' : 'secondary'}
               disabled={
@@ -487,7 +491,7 @@ function FaviconServiceDialog({control}: {control: Dialog.DialogControlProps}) {
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color="primary"
               disabled={shouldDisable()}>
@@ -563,7 +567,7 @@ function LibreTranslateInstanceDialog({
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color="primary"
               disabled={shouldDisable()}>
@@ -637,7 +641,7 @@ function ImageCdnHostDialog({control}: {control: Dialog.DialogControlProps}) {
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color="primary"
               disabled={shouldDisable()}>
@@ -773,7 +777,7 @@ function PostReplacementDialog({
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color="primary"
               disabled={shouldDisable()}>
@@ -891,7 +895,7 @@ function OpenRouterApiKeyDialog({
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color="primary">
               <ButtonText>
@@ -956,7 +960,7 @@ function OpenRouterModelDialog({
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color="primary">
               <ButtonText>
@@ -1026,7 +1030,7 @@ function OpenRouterPromptDialog({
             <Button
               label={_(msg`Save`)}
               size="large"
-              onPress={submit}
+              onPress={() => void submit()}
               variant="solid"
               color="primary">
               <ButtonText>
@@ -1133,6 +1137,10 @@ export function RunesSettingsScreen({}: Props) {
 
   const showLinkInHandle = useShowLinkInHandle()
   const setShowLinkInHandle = useSetShowLinkInHandle()
+  const showLinkInHandleOnlyOnWorkingLinks =
+    useShowLinkInHandleOnlyOnWorkingLinks()
+  const setShowLinkInHandleOnlyOnWorkingLinks =
+    useSetShowLinkInHandleOnlyOnWorkingLinks()
 
   const handleInLinks = useHandleInLinks()
   const setHandleInLinks = useSetHandleInLinks()
@@ -1395,6 +1403,19 @@ export function RunesSettingsScreen({}: Props) {
               </Toggle.LabelText>
               <Toggle.Platform />
             </Toggle.Item>
+            {showLinkInHandle && (
+              <Toggle.Item
+                name="show_link_in_handle_only_on_working_links"
+                label={_(msg`Only show URL on handles with working links`)}
+                value={showLinkInHandleOnlyOnWorkingLinks}
+                onChange={value => setShowLinkInHandleOnlyOnWorkingLinks(value)}
+                style={[a.w_full]}>
+                <Toggle.LabelText style={[a.flex_1]}>
+                  <Trans>Only show URL on handles with working links</Trans>
+                </Toggle.LabelText>
+                <Toggle.Platform />
+              </Toggle.Item>
+            )}
 
             <Toggle.Item
               name="no_discover_fallback"
diff --git a/src/state/persisted/schema.ts b/src/state/persisted/schema.ts
index b590b766a..a4af4fa62 100644
--- a/src/state/persisted/schema.ts
+++ b/src/state/persisted/schema.ts
@@ -150,6 +150,7 @@ const schema = z.object({
   repostCarouselEnabled: z.boolean().optional(),
   constellationInstance: z.string().optional(),
   showLinkInHandle: z.boolean().optional(),
+  showLinkInHandleOnlyOnWorkingLinks: z.boolean().optional(),
   hideFeedsPromoTab: z.boolean().optional(),
   disableViaRepostNotification: z.boolean().optional(),
   disableComposerPrompt: z.boolean().optional(),
@@ -272,6 +273,7 @@ export const defaults: Schema = {
   repostCarouselEnabled: false,
   constellationInstance: 'https://constellation.microcosm.blue/',
   showLinkInHandle: true,
+  showLinkInHandleOnlyOnWorkingLinks: true,
   hideFeedsPromoTab: false,
   disableViaRepostNotification: false,
   disableComposerPrompt: true,
diff --git a/src/state/preferences/index.tsx b/src/state/preferences/index.tsx
index 5041ab52a..fe117f506 100644
--- a/src/state/preferences/index.tsx
+++ b/src/state/preferences/index.tsx
@@ -43,6 +43,7 @@ import {Provider as PostNameReplacementProvider} from './post-name-replacement.t
 import {Provider as RepostCarouselProvider} from './repost-carousel-enabled'
 import {Provider as ShowFollowsYouBadgeProvider} from './show-follows-you-badge'
 import {Provider as ShowLinkInHandleProvider} from './show-link-in-handle'
+import {Provider as ShowLinkInHandleOnlyOnWorkingLinksProvider} from './show-link-in-handle-only-on-working-links'
 import {Provider as SubtitlesProvider} from './subtitles'
 import {Provider as TranslationServicePreferenceProvider} from './translation-service-preference'
 import {Provider as TrendingSettingsProvider} from './trending'
@@ -106,81 +107,83 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
                           <PdsLabelProvider>
                             <NoDiscoverProvider>
                               <ShowLinkInHandleProvider>
-                                <UseHandleInLinksProvider>
-                                  <LargeAltBadgeProvider>
-                                    <ExternalEmbedsProvider>
-                                      <HiddenPostsProvider>
-                                        <HighQualityImagesProvider>
-                                          <ImageCdnHostProvider>
-                                            <InAppBrowserProvider>
-                                              <DisableHapticsProvider>
-                                                <AutoplayProvider>
-                                                  <UsedStarterPacksProvider>
-                                                    <SubtitlesProvider>
-                                                      <TrendingSettingsProvider>
-                                                        <RepostCarouselProvider>
-                                                          <KawaiiProvider>
-                                                            <HideFeedsPromoTabProvider>
-                                                              <DisableViaRepostNotificationProvider>
-                                                                <DisableLikesMetricsProvider>
-                                                                  <DisableRepostsMetricsProvider>
-                                                                    <DisableQuotesMetricsProvider>
-                                                                      <DisableSavesMetricsProvider>
-                                                                        <DisableReplyMetricsProvider>
-                                                                          <DisableFollowersMetricsProvider>
-                                                                            <DisableFollowingMetricsProvider>
-                                                                              <DisableFollowedByMetricsProvider>
-                                                                                <DisablePostsMetricsProvider>
-                                                                                  <ShowFollowsYouBadgeProvider>
-                                                                                    <HideSimilarAccountsRecommProvider>
-                                                                                      <HideUnreplyablePostsProvider>
-                                                                                        <EnableSquareAvatarsProvider>
-                                                                                          <EnableSquareButtonsProvider>
-                                                                                            <PostNameReplacementProvider>
-                                                                                              <DisableVerifyEmailReminderProvider>
-                                                                                                <TranslationServicePreferenceProvider>
-                                                                                                  <OpenRouterProvider>
-                                                                                                    <DisableComposerPromptProvider>
-                                                                                                      <DiscoverContextEnabledProvider>
-                                                                                                        {
-                                                                                                          children
-                                                                                                        }
-                                                                                                      </DiscoverContextEnabledProvider>
-                                                                                                    </DisableComposerPromptProvider>
-                                                                                                  </OpenRouterProvider>
-                                                                                                </TranslationServicePreferenceProvider>
-                                                                                              </DisableVerifyEmailReminderProvider>
-                                                                                            </PostNameReplacementProvider>
-                                                                                          </EnableSquareButtonsProvider>
-                                                                                        </EnableSquareAvatarsProvider>
-                                                                                      </HideUnreplyablePostsProvider>
-                                                                                    </HideSimilarAccountsRecommProvider>
-                                                                                  </ShowFollowsYouBadgeProvider>
-                                                                                </DisablePostsMetricsProvider>
-                                                                              </DisableFollowedByMetricsProvider>
-                                                                            </DisableFollowingMetricsProvider>
-                                                                          </DisableFollowersMetricsProvider>
-                                                                        </DisableReplyMetricsProvider>
-                                                                      </DisableSavesMetricsProvider>
-                                                                    </DisableQuotesMetricsProvider>
-                                                                  </DisableRepostsMetricsProvider>
-                                                                </DisableLikesMetricsProvider>
-                                                              </DisableViaRepostNotificationProvider>
-                                                            </HideFeedsPromoTabProvider>
-                                                          </KawaiiProvider>
-                                                        </RepostCarouselProvider>
-                                                      </TrendingSettingsProvider>
-                                                    </SubtitlesProvider>
-                                                  </UsedStarterPacksProvider>
-                                                </AutoplayProvider>
-                                              </DisableHapticsProvider>
-                                            </InAppBrowserProvider>
-                                          </ImageCdnHostProvider>
-                                        </HighQualityImagesProvider>
-                                      </HiddenPostsProvider>
-                                    </ExternalEmbedsProvider>
-                                  </LargeAltBadgeProvider>
-                                </UseHandleInLinksProvider>
+                                <ShowLinkInHandleOnlyOnWorkingLinksProvider>
+                                  <UseHandleInLinksProvider>
+                                    <LargeAltBadgeProvider>
+                                      <ExternalEmbedsProvider>
+                                        <HiddenPostsProvider>
+                                          <HighQualityImagesProvider>
+                                            <ImageCdnHostProvider>
+                                              <InAppBrowserProvider>
+                                                <DisableHapticsProvider>
+                                                  <AutoplayProvider>
+                                                    <UsedStarterPacksProvider>
+                                                      <SubtitlesProvider>
+                                                        <TrendingSettingsProvider>
+                                                          <RepostCarouselProvider>
+                                                            <KawaiiProvider>
+                                                              <HideFeedsPromoTabProvider>
+                                                                <DisableViaRepostNotificationProvider>
+                                                                  <DisableLikesMetricsProvider>
+                                                                    <DisableRepostsMetricsProvider>
+                                                                      <DisableQuotesMetricsProvider>
+                                                                        <DisableSavesMetricsProvider>
+                                                                          <DisableReplyMetricsProvider>
+                                                                            <DisableFollowersMetricsProvider>
+                                                                              <DisableFollowingMetricsProvider>
+                                                                                <DisableFollowedByMetricsProvider>
+                                                                                  <DisablePostsMetricsProvider>
+                                                                                    <ShowFollowsYouBadgeProvider>
+                                                                                      <HideSimilarAccountsRecommProvider>
+                                                                                        <HideUnreplyablePostsProvider>
+                                                                                          <EnableSquareAvatarsProvider>
+                                                                                            <EnableSquareButtonsProvider>
+                                                                                              <PostNameReplacementProvider>
+                                                                                                <DisableVerifyEmailReminderProvider>
+                                                                                                  <TranslationServicePreferenceProvider>
+                                                                                                    <OpenRouterProvider>
+                                                                                                      <DisableComposerPromptProvider>
+                                                                                                        <DiscoverContextEnabledProvider>
+                                                                                                          {
+                                                                                                            children
+                                                                                                          }
+                                                                                                        </DiscoverContextEnabledProvider>
+                                                                                                      </DisableComposerPromptProvider>
+                                                                                                    </OpenRouterProvider>
+                                                                                                  </TranslationServicePreferenceProvider>
+                                                                                                </DisableVerifyEmailReminderProvider>
+                                                                                              </PostNameReplacementProvider>
+                                                                                            </EnableSquareButtonsProvider>
+                                                                                          </EnableSquareAvatarsProvider>
+                                                                                        </HideUnreplyablePostsProvider>
+                                                                                      </HideSimilarAccountsRecommProvider>
+                                                                                    </ShowFollowsYouBadgeProvider>
+                                                                                  </DisablePostsMetricsProvider>
+                                                                                </DisableFollowedByMetricsProvider>
+                                                                              </DisableFollowingMetricsProvider>
+                                                                            </DisableFollowersMetricsProvider>
+                                                                          </DisableReplyMetricsProvider>
+                                                                        </DisableSavesMetricsProvider>
+                                                                      </DisableQuotesMetricsProvider>
+                                                                    </DisableRepostsMetricsProvider>
+                                                                  </DisableLikesMetricsProvider>
+                                                                </DisableViaRepostNotificationProvider>
+                                                              </HideFeedsPromoTabProvider>
+                                                            </KawaiiProvider>
+                                                          </RepostCarouselProvider>
+                                                        </TrendingSettingsProvider>
+                                                      </SubtitlesProvider>
+                                                    </UsedStarterPacksProvider>
+                                                  </AutoplayProvider>
+                                                </DisableHapticsProvider>
+                                              </InAppBrowserProvider>
+                                            </ImageCdnHostProvider>
+                                          </HighQualityImagesProvider>
+                                        </HiddenPostsProvider>
+                                      </ExternalEmbedsProvider>
+                                    </LargeAltBadgeProvider>
+                                  </UseHandleInLinksProvider>
+                                </ShowLinkInHandleOnlyOnWorkingLinksProvider>
                               </ShowLinkInHandleProvider>
                             </NoDiscoverProvider>
                           </PdsLabelProvider>
diff --git a/src/state/preferences/show-link-in-handle-only-on-working-links.tsx b/src/state/preferences/show-link-in-handle-only-on-working-links.tsx
new file mode 100644
index 000000000..6910aff0e
--- /dev/null
+++ b/src/state/preferences/show-link-in-handle-only-on-working-links.tsx
@@ -0,0 +1,66 @@
+import {
+  createContext,
+  type PropsWithChildren,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from 'react'
+
+import * as persisted from '#/state/persisted'
+
+type StateContext = persisted.Schema['showLinkInHandleOnlyOnWorkingLinks']
+type SetContext = (
+  v: persisted.Schema['showLinkInHandleOnlyOnWorkingLinks'],
+) => void
+
+const stateContext = createContext<StateContext>(
+  persisted.defaults.showLinkInHandleOnlyOnWorkingLinks,
+)
+const setContext = createContext<SetContext>(
+  (_: persisted.Schema['showLinkInHandleOnlyOnWorkingLinks']) => {},
+)
+
+export function Provider({children}: PropsWithChildren<{}>) {
+  const [state, setState] = useState(
+    persisted.get('showLinkInHandleOnlyOnWorkingLinks'),
+  )
+
+  const setStateWrapped = useCallback(
+    (
+      showLinkInHandleOnlyOnWorkingLinks: persisted.Schema['showLinkInHandleOnlyOnWorkingLinks'],
+    ) => {
+      setState(showLinkInHandleOnlyOnWorkingLinks)
+      void persisted.write(
+        'showLinkInHandleOnlyOnWorkingLinks',
+        showLinkInHandleOnlyOnWorkingLinks,
+      )
+    },
+    [setState],
+  )
+
+  useEffect(() => {
+    return persisted.onUpdate(
+      'showLinkInHandleOnlyOnWorkingLinks',
+      nextShowLinkInHandleOnlyOnWorkingLinks => {
+        setState(nextShowLinkInHandleOnlyOnWorkingLinks)
+      },
+    )
+  }, [setStateWrapped])
+
+  return (
+    <stateContext.Provider value={state}>
+      <setContext.Provider value={setStateWrapped}>
+        {children}
+      </setContext.Provider>
+    </stateContext.Provider>
+  )
+}
+
+export function useShowLinkInHandleOnlyOnWorkingLinks() {
+  return useContext(stateContext)
+}
+
+export function useSetShowLinkInHandleOnlyOnWorkingLinks() {
+  return useContext(setContext)
+}
diff --git a/src/state/queries/__tests__/handle-link-test.ts b/src/state/queries/__tests__/handle-link-test.ts
new file mode 100644
index 000000000..b97b051ee
--- /dev/null
+++ b/src/state/queries/__tests__/handle-link-test.ts
@@ -0,0 +1,60 @@
+import {beforeEach, describe, expect, it, jest} from '@jest/globals'
+
+import {hasWorkingHandleLink} from '../handle-link'
+
+describe('handle link DNS checks', () => {
+  beforeEach(() => {
+    jest.restoreAllMocks()
+  })
+
+  it('returns true when any DNS record type resolves', async () => {
+    const fetchSpy = jest
+      .spyOn(globalThis, 'fetch')
+      .mockResolvedValueOnce({
+        ok: true,
+        json: () => Promise.resolve({Answer: []}),
+      } as Response)
+      .mockResolvedValueOnce({
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            Answer: [{data: '2606:4700:4700::1111'}],
+          }),
+      } as Response)
+      .mockResolvedValueOnce({
+        ok: true,
+        json: () => Promise.resolve({Answer: []}),
+      } as Response)
+
+    await expect(hasWorkingHandleLink('alice.example')).resolves.toBe(true)
+    expect(fetchSpy).toHaveBeenCalledTimes(3)
+
+    const urls = fetchSpy.mock.calls.map(([url]) => {
+      if (url instanceof URL) return url.toString()
+      if (typeof url === 'string') return url
+      return url.url
+    })
+    expect(urls.every(url => url.includes('name=alice.example'))).toBe(true)
+    expect(urls).toContainEqual(expect.stringContaining('type=A'))
+    expect(urls).toContainEqual(expect.stringContaining('type=AAAA'))
+    expect(urls).toContainEqual(expect.stringContaining('type=CNAME'))
+  })
+
+  it('returns false when no DNS record type resolves', async () => {
+    jest
+      .spyOn(globalThis, 'fetch')
+      .mockResolvedValueOnce({
+        ok: false,
+      } as Response)
+      .mockResolvedValueOnce({
+        ok: true,
+        json: () => Promise.resolve({Answer: []}),
+      } as Response)
+      .mockResolvedValueOnce({
+        ok: true,
+        json: () => Promise.resolve({}),
+      } as Response)
+
+    await expect(hasWorkingHandleLink('alice.example')).resolves.toBe(false)
+  })
+})
diff --git a/src/state/queries/handle-link.ts b/src/state/queries/handle-link.ts
new file mode 100644
index 000000000..3cb3db9fe
--- /dev/null
+++ b/src/state/queries/handle-link.ts
@@ -0,0 +1,64 @@
+import {useQuery} from '@tanstack/react-query'
+
+import {DOH_ENDPOINT} from '#/lib/constants'
+import {STALE} from '#/state/queries'
+
+const DNS_RECORD_TYPES = ['A', 'AAAA', 'CNAME'] as const
+
+type DnsJsonResponse = {
+  Answer?: Array<{data?: string}>
+}
+
+export const RQKEY_ROOT = 'handle-link'
+export const RQKEY = (handle: string) => [RQKEY_ROOT, handle]
+
+async function hasDnsAnswers(
+  handle: string,
+  type: (typeof DNS_RECORD_TYPES)[number],
+  signal?: AbortSignal,
+) {
+  const url = new URL(DOH_ENDPOINT)
+  url.searchParams.set('name', handle)
+  url.searchParams.set('type', type)
+
+  const response = await fetch(url, {
+    headers: {
+      accept: 'application/dns-json',
+    },
+    redirect: 'follow',
+    signal,
+  })
+
+  if (!response.ok) {
+    return false
+  }
+
+  const result = (await response.json()) as DnsJsonResponse
+  return Array.isArray(result.Answer) && result.Answer.length > 0
+}
+
+export async function hasWorkingHandleLink(
+  handle: string,
+  signal?: AbortSignal,
+) {
+  const results = await Promise.allSettled(
+    DNS_RECORD_TYPES.map(type => hasDnsAnswers(handle, type, signal)),
+  )
+
+  signal?.throwIfAborted()
+
+  return results.some(
+    result => result.status === 'fulfilled' && Boolean(result.value),
+  )
+}
+
+export function useHandleLinkQuery(handle: string, enabled = true) {
+  return useQuery({
+    queryKey: RQKEY(handle),
+    queryFn: async ({signal}) => {
+      return hasWorkingHandleLink(handle, signal)
+    },
+    enabled,
+    staleTime: STALE.HOURS.ONE,
+  })
+}
diff --git a/src/state/session/identity-resolver.ts b/src/state/session/identity-resolver.ts
index 535f9ff9c..a1f1111a3 100644
--- a/src/state/session/identity-resolver.ts
+++ b/src/state/session/identity-resolver.ts
@@ -1,5 +1,10 @@
 import {type ComAtprotoIdentityDefs, isDid} from '@atproto/api'
+import {
+  type IdentityInfo,
+  type IdentityResolver,
+} from '@atproto-labs/identity-resolver'
 
+import {DOH_ENDPOINT} from '#/lib/constants'
 import {createPublicAgent} from './agent'
 
 type AtprotoDid = `did:plc:${string}` | `did:web:${string}`
@@ -15,19 +20,7 @@ type Service = {
   serviceEndpoint?: string
 }
 
-type IdentityResolver = {
-  resolve(
-    input: string,
-    options?: {signal?: AbortSignal},
-  ): Promise<{
-    did: AtprotoDid
-    didDoc: DidDocument
-    handle: string
-  }>
-}
-
 const HANDLE_INVALID = 'handle.invalid'
-const DOH_ENDPOINT = 'https://cloudflare-dns.com/dns-query'
 
 function asNormalizedHandle(input: string) {
   const handle = input.toLowerCase()
@@ -242,16 +235,12 @@ export function createIdentityResolver(): IdentityResolver {
     async resolve(
       input: string,
       options?: {signal?: AbortSignal},
-    ): Promise<{
-      did: AtprotoDid
-      didDoc: DidDocument
-      handle: string
-    }> {
+    ): Promise<IdentityInfo> {
       const identity = await resolveIdentityUsingAppView(input, options?.signal)
 
       return {
         did: identity.did as AtprotoDid,
-        didDoc: identity.didDoc as DidDocument,
+        didDoc: identity.didDoc as IdentityInfo['didDoc'],
         handle: identity.handle,
       }
     },