diff --git a/package.json b/package.json
index 281cb0d8b0..c233d0f832 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,6 @@
   "dependencies": {
     "@atproto/common-web": "0.5.6",
     "@atproto/lex": "0.2.2",
-    "@atproto/lex-client": "0.2.4",
     "@atproto/lex-password-session": "0.1.7",
     "@atproto/syntax": "0.7.2",
     "@bitdrift/react-native": "^0.6.8",
diff --git a/src/ageAssurance/data.tsx b/src/ageAssurance/data.tsx
index 148caee2df..ff202807ec 100644
--- a/src/ageAssurance/data.tsx
+++ b/src/ageAssurance/data.tsx
@@ -1,6 +1,6 @@
 import {createContext, useCallback, useContext, useEffect, useMemo} from 'react'
 import * as AgeRange from 'expo-age-range'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {getPreferences} from '@bsky.app/sdk'
 import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister'
 import {focusManager, QueryClient, useQuery} from '@tanstack/react-query'
diff --git a/src/ageAssurance/useBeginAgeAssurance.ts b/src/ageAssurance/useBeginAgeAssurance.ts
index c1cdd2f21a..3dddb60dc0 100644
--- a/src/ageAssurance/useBeginAgeAssurance.ts
+++ b/src/ageAssurance/useBeginAgeAssurance.ts
@@ -1,5 +1,5 @@
 import {Platform} from 'react-native'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {useMutation} from '@tanstack/react-query'
 
 import {wait} from '#/lib/async/wait'
diff --git a/src/components/contacts/screens/GetContacts.tsx b/src/components/contacts/screens/GetContacts.tsx
index a755382bf6..508afd6970 100644
--- a/src/components/contacts/screens/GetContacts.tsx
+++ b/src/components/contacts/screens/GetContacts.tsx
@@ -3,7 +3,7 @@ import {Alert, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as Contacts from 'expo-contacts'
 import {type Un$Typed} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {toDatetimeString} from '@atproto/syntax'
 import {upsertProfile} from '@bsky.app/sdk'
 import {msg, t} from '@lingui/core/macro'
diff --git a/src/components/dialogs/EmailDialog/data/useUpdateEmail.ts b/src/components/dialogs/EmailDialog/data/useUpdateEmail.ts
index 167cebda3d..7293227f59 100644
--- a/src/components/dialogs/EmailDialog/data/useUpdateEmail.ts
+++ b/src/components/dialogs/EmailDialog/data/useUpdateEmail.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {useMutation} from '@tanstack/react-query'
 
 import {usePdsClient, useSessionApi} from '#/state/session'
diff --git a/src/components/moderation/AppealForm.tsx b/src/components/moderation/AppealForm.tsx
index 31a2c4d339..2036be915e 100644
--- a/src/components/moderation/AppealForm.tsx
+++ b/src/components/moderation/AppealForm.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type Service} from '@atproto/lex-client'
+import {type Service} from '@atproto/lex'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {Trans} from '@lingui/react/macro'
diff --git a/src/components/moderation/ReportDialog/action.ts b/src/components/moderation/ReportDialog/action.ts
index 1a6e6f64e9..e483a1d0c7 100644
--- a/src/components/moderation/ReportDialog/action.ts
+++ b/src/components/moderation/ReportDialog/action.ts
@@ -1,4 +1,4 @@
-import {type Service} from '@atproto/lex-client'
+import {type Service} from '@atproto/lex'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'
diff --git a/src/lib/api/feed/author.ts b/src/lib/api/feed/author.ts
index 36a9d20dd2..58d1d66a5e 100644
--- a/src/lib/api/feed/author.ts
+++ b/src/lib/api/feed/author.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import * as bsky from '#/types/bsky'
diff --git a/src/lib/api/feed/custom.ts b/src/lib/api/feed/custom.ts
index 2cc94df8d8..9076cb8872 100644
--- a/src/lib/api/feed/custom.ts
+++ b/src/lib/api/feed/custom.ts
@@ -1,5 +1,5 @@
 import {lexParse} from '@atproto/lex'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 
 import {
   getAppLanguageAsContentLanguage,
diff --git a/src/lib/api/feed/demo.ts b/src/lib/api/feed/demo.ts
index 4c8937cf00..6f092d1473 100644
--- a/src/lib/api/feed/demo.ts
+++ b/src/lib/api/feed/demo.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {DEMO_FEED} from '#/lib/demo'
 import {type app} from '#/lexicons'
diff --git a/src/lib/api/feed/following.ts b/src/lib/api/feed/following.ts
index ea03f8ce17..4e3590ad9e 100644
--- a/src/lib/api/feed/following.ts
+++ b/src/lib/api/feed/following.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
diff --git a/src/lib/api/feed/home.ts b/src/lib/api/feed/home.ts
index fd122889ff..277d55beb2 100644
--- a/src/lib/api/feed/home.ts
+++ b/src/lib/api/feed/home.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 
 import {PROD_DEFAULT_FEED} from '#/lib/constants'
diff --git a/src/lib/api/feed/likes.ts b/src/lib/api/feed/likes.ts
index 7a0702bd52..4cb59c37dc 100644
--- a/src/lib/api/feed/likes.ts
+++ b/src/lib/api/feed/likes.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
diff --git a/src/lib/api/feed/list.ts b/src/lib/api/feed/list.ts
index 35d35ec1e7..9d6ae55537 100644
--- a/src/lib/api/feed/list.ts
+++ b/src/lib/api/feed/list.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {app} from '#/lexicons'
 import {type FeedAPI, type FeedAPIResponse} from './types'
diff --git a/src/lib/api/feed/merge.ts b/src/lib/api/feed/merge.ts
index 0c1d2782b4..d438ad6593 100644
--- a/src/lib/api/feed/merge.ts
+++ b/src/lib/api/feed/merge.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import shuffle from 'lodash.shuffle'
 
diff --git a/src/lib/api/feed/posts.ts b/src/lib/api/feed/posts.ts
index 0c35e98245..0692d6d5d6 100644
--- a/src/lib/api/feed/posts.ts
+++ b/src/lib/api/feed/posts.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {logger} from '#/logger'
 import {app} from '#/lexicons'
diff --git a/src/lib/api/feed/types.ts b/src/lib/api/feed/types.ts
index 9725566113..672760cc38 100644
--- a/src/lib/api/feed/types.ts
+++ b/src/lib/api/feed/types.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {type app} from '#/lexicons'
 
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index 305dbe1e5a..522202d34e 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -1,6 +1,6 @@
 import {TID} from '@atproto/common-web'
 import {type $Typed} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {
   type AtUriString,
   toDatetimeString,
diff --git a/src/lib/api/resolve.ts b/src/lib/api/resolve.ts
index 36558609b4..2bda01cbc0 100644
--- a/src/lib/api/resolve.ts
+++ b/src/lib/api/resolve.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString, type HandleString} from '@atproto/syntax'
 
 import {IMAGE_SIZE_CONFIG_2K_1MB} from '#/lib/constants'
diff --git a/src/lib/api/upload-blob.ts b/src/lib/api/upload-blob.ts
index ff237d2ad9..e6dba71b23 100644
--- a/src/lib/api/upload-blob.ts
+++ b/src/lib/api/upload-blob.ts
@@ -1,6 +1,5 @@
 import {copyAsync} from 'expo-file-system/legacy'
-import {type BlobRef} from '@atproto/lex'
-import {type Client, type EncodingString} from '@atproto/lex-client'
+import {type BlobRef, type Client, type EncodingString} from '@atproto/lex'
 
 import {safeDeleteAsync} from '#/lib/media/manip'
 
diff --git a/src/lib/api/upload-blob.web.ts b/src/lib/api/upload-blob.web.ts
index 774d1fc1e5..2dbdca5ead 100644
--- a/src/lib/api/upload-blob.web.ts
+++ b/src/lib/api/upload-blob.web.ts
@@ -1,5 +1,4 @@
-import {type BlobRef} from '@atproto/lex'
-import {type Client, type EncodingString} from '@atproto/lex-client'
+import {type BlobRef, type Client, type EncodingString} from '@atproto/lex'
 
 /**
  * The blob-upload response body: `{blob}`. lex `Client.uploadBlob` returns the
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index c16a8d3b4b..ad1d70ff01 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,5 +1,5 @@
 import {type Insets, Platform} from 'react-native'
-import {type Service} from '@atproto/lex-client'
+import {type Service} from '@atproto/lex'
 import {api} from '@bsky.app/sdk'
 
 import {BLUESKY_PROXY_DID, IS_DEV} from '#/env'
diff --git a/src/lib/generate-starterpack.ts b/src/lib/generate-starterpack.ts
index d41ec6e9db..24dd5910dd 100644
--- a/src/lib/generate-starterpack.ts
+++ b/src/lib/generate-starterpack.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString, type DatetimeString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
diff --git a/src/lib/media/video/multipart/upload.ts b/src/lib/media/video/multipart/upload.ts
index 4fbaa6b226..88c92813ae 100644
--- a/src/lib/media/video/multipart/upload.ts
+++ b/src/lib/media/video/multipart/upload.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {nanoid} from 'nanoid/non-secure'
 
 import {AbortError} from '#/lib/async/cancelable'
diff --git a/src/lib/media/video/upload.shared.ts b/src/lib/media/video/upload.shared.ts
index 4bf514c7ab..0e7542a6cb 100644
--- a/src/lib/media/video/upload.shared.ts
+++ b/src/lib/media/video/upload.shared.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type NsidString} from '@atproto/syntax'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
diff --git a/src/lib/media/video/upload.ts b/src/lib/media/video/upload.ts
index ec7f972c55..287c8f09c6 100644
--- a/src/lib/media/video/upload.ts
+++ b/src/lib/media/video/upload.ts
@@ -1,5 +1,5 @@
 import {createUploadTask, FileSystemUploadType} from 'expo-file-system/legacy'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 import {nanoid} from 'nanoid/non-secure'
diff --git a/src/lib/media/video/upload.web.ts b/src/lib/media/video/upload.web.ts
index 2028a346b8..90c10a0684 100644
--- a/src/lib/media/video/upload.web.ts
+++ b/src/lib/media/video/upload.web.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'
 import {nanoid} from 'nanoid/non-secure'
diff --git a/src/lib/media/video/util.ts b/src/lib/media/video/util.ts
index 8d8cb11a72..8147926d28 100644
--- a/src/lib/media/video/util.ts
+++ b/src/lib/media/video/util.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 
 import {type SupportedMimeTypes, VIDEO_SERVICE} from '#/lib/constants'
 
diff --git a/src/lib/moderation.ts b/src/lib/moderation.ts
index 6b0ef23a2e..a87488fdd9 100644
--- a/src/lib/moderation.ts
+++ b/src/lib/moderation.ts
@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {
   type InterpretedLabelValueDefinition,
   LABELS,
diff --git a/src/lib/notifications/__tests__/notifications-proxy.test.ts b/src/lib/notifications/__tests__/notifications-proxy.test.ts
index 5c3a909723..5d791ff84f 100644
--- a/src/lib/notifications/__tests__/notifications-proxy.test.ts
+++ b/src/lib/notifications/__tests__/notifications-proxy.test.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {describe, expect, it} from '@jest/globals'
 
 import {NOTIF_SERVICE} from '#/lib/constants'
diff --git a/src/lib/notifications/notifications.ts b/src/lib/notifications/notifications.ts
index 0e8e78cd0b..8d494f961d 100644
--- a/src/lib/notifications/notifications.ts
+++ b/src/lib/notifications/notifications.ts
@@ -2,7 +2,7 @@ import {useCallback, useEffect} from 'react'
 import {Platform} from 'react-native'
 import * as Notifications from 'expo-notifications'
 import {getBadgeCountAsync, setBadgeCountAsync} from 'expo-notifications'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import debounce from 'lodash.debounce'
 
 import {
diff --git a/src/lib/strings/__tests__/errors.test.ts b/src/lib/strings/__tests__/errors.test.ts
index d8cff26985..04220975fe 100644
--- a/src/lib/strings/__tests__/errors.test.ts
+++ b/src/lib/strings/__tests__/errors.test.ts
@@ -1,8 +1,4 @@
-import {
-  type Procedure,
-  type Query,
-  XrpcResponseError,
-} from '@atproto/lex-client'
+import {type Procedure, type Query, XrpcResponseError} from '@atproto/lex'
 import {describe, expect, it} from '@jest/globals'
 
 import {
diff --git a/src/lib/xrpc-error.ts b/src/lib/xrpc-error.ts
index 2ccf720a72..d403ea3600 100644
--- a/src/lib/xrpc-error.ts
+++ b/src/lib/xrpc-error.ts
@@ -1,4 +1,4 @@
-import {LexError, XrpcError, XrpcResponseError} from '@atproto/lex-client'
+import {LexError, XrpcError, XrpcResponseError} from '@atproto/lex'
 
 /**
  * True for an XRPC error from a lex `Client` (`@atproto/lex-client` `XrpcError`,
diff --git a/src/screens/Login/ForgotPasswordForm.tsx b/src/screens/Login/ForgotPasswordForm.tsx
index b6eff6f560..835d86438d 100644
--- a/src/screens/Login/ForgotPasswordForm.tsx
+++ b/src/screens/Login/ForgotPasswordForm.tsx
@@ -1,6 +1,6 @@
 import {useCallback, useState} from 'react'
 import {Keyboard, View} from 'react-native'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {Trans, useLingui} from '@lingui/react/macro'
 import * as EmailValidator from 'email-validator'
 
diff --git a/src/screens/Login/SetNewPasswordForm.tsx b/src/screens/Login/SetNewPasswordForm.tsx
index 5d57be2e6a..3493799c88 100644
--- a/src/screens/Login/SetNewPasswordForm.tsx
+++ b/src/screens/Login/SetNewPasswordForm.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {cleanError, isNetworkError} from '#/lib/strings/errors'
diff --git a/src/screens/Onboarding/util.ts b/src/screens/Onboarding/util.ts
index ae5caee357..e026a99894 100644
--- a/src/screens/Onboarding/util.ts
+++ b/src/screens/Onboarding/util.ts
@@ -1,6 +1,5 @@
 import {TID} from '@atproto/common-web'
-import {type $Typed} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
+import {type $Typed, type Client} from '@atproto/lex'
 import {
   type AtIdentifierString,
   type DidString,
diff --git a/src/screens/Profile/components/GermButton.tsx b/src/screens/Profile/components/GermButton.tsx
index 04a31616c1..c481edd924 100644
--- a/src/screens/Profile/components/GermButton.tsx
+++ b/src/screens/Profile/components/GermButton.tsx
@@ -1,6 +1,6 @@
 import {Platform, View} from 'react-native'
 import {Image} from 'expo-image'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
diff --git a/src/state/feed-feedback.tsx b/src/state/feed-feedback.tsx
index fa8a24d383..50c1d88e53 100644
--- a/src/state/feed-feedback.tsx
+++ b/src/state/feed-feedback.tsx
@@ -7,7 +7,7 @@ import {
   useRef,
 } from 'react'
 import {AppState, type AppStateStatus} from 'react-native'
-import {type Service} from '@atproto/lex-client'
+import {type Service} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import throttle from 'lodash.throttle'
 
diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts
index c8fc3b8457..32d5fbdbe3 100644
--- a/src/state/messages/convo/agent.ts
+++ b/src/state/messages/convo/agent.ts
@@ -1,5 +1,4 @@
-import {type $Typed} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
+import {type $Typed, type Client} from '@atproto/lex'
 import {type DatetimeString, type DidString} from '@atproto/syntax'
 import {EventEmitter} from 'eventemitter3'
 import {nanoid} from 'nanoid/non-secure'
diff --git a/src/state/messages/convo/types.ts b/src/state/messages/convo/types.ts
index 2d2d3c1fa3..89a9f3d0a7 100644
--- a/src/state/messages/convo/types.ts
+++ b/src/state/messages/convo/types.ts
@@ -1,5 +1,4 @@
-import {type $Typed} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
+import {type $Typed, type Client} from '@atproto/lex'
 
 import {type MessagesEventBus} from '#/state/messages/events/agent'
 import {type ConvoWithDetails} from '#/components/dms/util'
diff --git a/src/state/messages/events/agent.ts b/src/state/messages/events/agent.ts
index b061d7b390..b4a4a1269e 100644
--- a/src/state/messages/events/agent.ts
+++ b/src/state/messages/events/agent.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {EventEmitter} from 'eventemitter3'
 import {nanoid} from 'nanoid/non-secure'
 
diff --git a/src/state/messages/events/types.ts b/src/state/messages/events/types.ts
index d05c8689db..d034a416a4 100644
--- a/src/state/messages/events/types.ts
+++ b/src/state/messages/events/types.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {type chat} from '#/lexicons'
 
diff --git a/src/state/preferences/moderation-opts.tsx b/src/state/preferences/moderation-opts.tsx
index 7d506021bc..77ef89f283 100644
--- a/src/state/preferences/moderation-opts.tsx
+++ b/src/state/preferences/moderation-opts.tsx
@@ -1,5 +1,5 @@
 import {createContext, useContext, useMemo} from 'react'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {type ModerationOpts} from '@bsky.app/sdk/moderation'
 
 import {useHiddenPosts, useLabelDefinitions} from '#/state/preferences'
diff --git a/src/state/queries/handle-availability.ts b/src/state/queries/handle-availability.ts
index 2be587dd96..5f48df57a9 100644
--- a/src/state/queries/handle-availability.ts
+++ b/src/state/queries/handle-availability.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {type DatetimeString, type HandleString} from '@atproto/syntax'
 import {useQuery} from '@tanstack/react-query'
 
diff --git a/src/state/queries/join-links.ts b/src/state/queries/join-links.ts
index 30d48d2478..a56d367d95 100644
--- a/src/state/queries/join-links.ts
+++ b/src/state/queries/join-links.ts
@@ -1,6 +1,5 @@
 import {useCallback} from 'react'
-import {type $Typed} from '@atproto/lex'
-import {Client} from '@atproto/lex-client'
+import {type $Typed, Client} from '@atproto/lex'
 import {toDatetimeString} from '@atproto/syntax'
 import {type QueryClient, useQuery, useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/state/queries/list-members.ts b/src/state/queries/list-members.ts
index 405f7dde07..9ee743be04 100644
--- a/src/state/queries/list-members.ts
+++ b/src/state/queries/list-members.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import {
   type InfiniteData,
diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts
index 16f798a10c..c884b70d38 100644
--- a/src/state/queries/list.ts
+++ b/src/state/queries/list.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {
   type AtIdentifierString,
   AtUri,
diff --git a/src/state/queries/messages/actor-declaration.ts b/src/state/queries/messages/actor-declaration.ts
index 8e1b374df4..c3a71c49b5 100644
--- a/src/state/queries/messages/actor-declaration.ts
+++ b/src/state/queries/messages/actor-declaration.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type DidString} from '@atproto/syntax'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/state/queries/messages/restrictChatSettings.ts b/src/state/queries/messages/restrictChatSettings.ts
index 5bf7026466..80e8ad15f2 100644
--- a/src/state/queries/messages/restrictChatSettings.ts
+++ b/src/state/queries/messages/restrictChatSettings.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 
 import {networkRetry} from '#/lib/async/retry'
 import {logger} from '#/logger'
diff --git a/src/state/queries/notifications/util.ts b/src/state/queries/notifications/util.ts
index e735583db9..ca0ddae0f6 100644
--- a/src/state/queries/notifications/util.ts
+++ b/src/state/queries/notifications/util.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {type AtUriString} from '@atproto/syntax'
 import {
   hasMutedWord,
diff --git a/src/state/queries/pds-detection.ts b/src/state/queries/pds-detection.ts
index cbf8b19c62..512ef9d385 100644
--- a/src/state/queries/pds-detection.ts
+++ b/src/state/queries/pds-detection.ts
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {type DidDocument, getPdsEndpoint} from '@atproto/common-web'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {type HandleString} from '@atproto/syntax'
 import {useQuery, useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts
index a198aa8669..e0b63004f8 100644
--- a/src/state/queries/post-feed.ts
+++ b/src/state/queries/post-feed.ts
@@ -1,6 +1,6 @@
 import {useCallback, useEffect, useMemo, useRef} from 'react'
 import {AppState} from 'react-native'
-import {type AtIdentifierString, type Client} from '@atproto/lex-client'
+import {type AtIdentifierString, type Client} from '@atproto/lex'
 import {AtUri, type AtUriString} from '@atproto/syntax'
 import {
   moderatePost,
diff --git a/src/state/queries/postgate/index.ts b/src/state/queries/postgate/index.ts
index 780cfbfecd..626c8354cd 100644
--- a/src/state/queries/postgate/index.ts
+++ b/src/state/queries/postgate/index.ts
@@ -1,5 +1,5 @@
 import {useRef} from 'react'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/state/queries/preferences/moderation.ts b/src/state/queries/preferences/moderation.ts
index fc0e18aca8..f7d237995e 100644
--- a/src/state/queries/preferences/moderation.ts
+++ b/src/state/queries/preferences/moderation.ts
@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {interpretLabelValueDefinitions} from '@bsky.app/sdk/moderation'
 
 import {isNonConfigurableModerationAuthority} from '#/state/session/additional-moderation-authorities'
diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts
index fec930fbc9..2b33452cd7 100644
--- a/src/state/queries/profile.ts
+++ b/src/state/queries/profile.ts
@@ -4,7 +4,7 @@ import {
   type AtIdentifierString,
   type Client,
   type DidString,
-} from '@atproto/lex-client'
+} from '@atproto/lex'
 import {type DatetimeString} from '@atproto/lex-schema'
 import {AtUri, type AtUriString} from '@atproto/syntax'
 import {
diff --git a/src/state/queries/resolve-uri.ts b/src/state/queries/resolve-uri.ts
index c828b48135..b5ada394c0 100644
--- a/src/state/queries/resolve-uri.ts
+++ b/src/state/queries/resolve-uri.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri, type HandleString} from '@atproto/syntax'
 import {type QueryClient, queryOptions, useQuery} from '@tanstack/react-query'
 
diff --git a/src/state/queries/service.ts b/src/state/queries/service.ts
index 3b1df174e8..45ccc42e8d 100644
--- a/src/state/queries/service.ts
+++ b/src/state/queries/service.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {useQuery} from '@tanstack/react-query'
 
 import {com} from '#/lexicons'
diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts
index 9a5778ec6a..03646b7b00 100644
--- a/src/state/queries/starter-packs.ts
+++ b/src/state/queries/starter-packs.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString, type DatetimeString} from '@atproto/syntax'
 import {RichText} from '@bsky.app/sdk/richtext'
 import {
diff --git a/src/state/queries/threadgate/index.ts b/src/state/queries/threadgate/index.ts
index 41ba960103..1bfebbd05f 100644
--- a/src/state/queries/threadgate/index.ts
+++ b/src/state/queries/threadgate/index.ts
@@ -1,4 +1,4 @@
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri} from '@atproto/syntax'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 
diff --git a/src/state/session/__tests__/clients-bundle-test.ts b/src/state/session/__tests__/clients-bundle-test.ts
index 14de6a05c3..6a798e8f02 100644
--- a/src/state/session/__tests__/clients-bundle-test.ts
+++ b/src/state/session/__tests__/clients-bundle-test.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {PasswordSession} from '@atproto/lex-password-session'
 import {api} from '@bsky.app/sdk'
 import {describe, expect, it, jest} from '@jest/globals'
diff --git a/src/state/session/additional-moderation-authorities.ts b/src/state/session/additional-moderation-authorities.ts
index dbc2271ab4..76dac30e5b 100644
--- a/src/state/session/additional-moderation-authorities.ts
+++ b/src/state/session/additional-moderation-authorities.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 
 import {device} from '#/storage'
 
diff --git a/src/state/session/clients.ts b/src/state/session/clients.ts
index 67cc2669a2..242631f38e 100644
--- a/src/state/session/clients.ts
+++ b/src/state/session/clients.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {type PasswordSession} from '@atproto/lex-password-session'
 import {api} from '@bsky.app/sdk'
 
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 442f724325..148f5cef92 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -8,7 +8,7 @@ import {
   useState,
   useSyncExternalStore,
 } from 'react'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {PasswordSession, type SessionData} from '@atproto/lex-password-session'
 
 import * as persisted from '#/state/persisted'
diff --git a/src/state/session/moderation.ts b/src/state/session/moderation.ts
index b0b085576e..abc4de1652 100644
--- a/src/state/session/moderation.ts
+++ b/src/state/session/moderation.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {api} from '@bsky.app/sdk'
 
 import {IS_TEST_USER} from '#/lib/constants'
diff --git a/src/state/session/session-core.ts b/src/state/session/session-core.ts
index 8bad74d1d7..8f9a80e65e 100644
--- a/src/state/session/session-core.ts
+++ b/src/state/session/session-core.ts
@@ -1,5 +1,5 @@
 import {TID} from '@atproto/common-web'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {
   PasswordSession,
   type PasswordSessionOptions,
diff --git a/src/state/session/util.ts b/src/state/session/util.ts
index b548516b32..02e21aee88 100644
--- a/src/state/session/util.ts
+++ b/src/state/session/util.ts
@@ -1,4 +1,4 @@
-import {Client} from '@atproto/lex-client'
+import {Client} from '@atproto/lex'
 import {PasswordSession} from '@atproto/lex-password-session'
 
 import {isJwtExpired} from '#/lib/jwt'
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index fbd2fc8222..41981f948b 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -46,7 +46,7 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnUI} from 'react-native-worklets'
 import * as FileSystem from 'expo-file-system'
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {type Client} from '@atproto/lex-client'
+import {type Client} from '@atproto/lex'
 import {AtUri, type AtUriString} from '@atproto/syntax'
 import {type RichText} from '@bsky.app/sdk/richtext'
 import {plural} from '@lingui/core/macro'
diff --git a/src/view/com/composer/state/video.ts b/src/view/com/composer/state/video.ts
index 34d7a806e1..87267df543 100644
--- a/src/view/com/composer/state/video.ts
+++ b/src/view/com/composer/state/video.ts
@@ -1,6 +1,5 @@
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {type BlobRef} from '@atproto/lex'
-import {type Client} from '@atproto/lex-client'
+import {type BlobRef, type Client} from '@atproto/lex'
 import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/core/macro'