diff --git a/src/components/dms/dialogs/NewChatDialog.tsx b/src/components/dms/dialogs/NewChatDialog.tsx
index 4cca14bd0a..7ee103ef9b 100644
--- a/src/components/dms/dialogs/NewChatDialog.tsx
+++ b/src/components/dms/dialogs/NewChatDialog.tsx
@@ -1,5 +1,4 @@
 import {useCallback} from 'react'
-import {ChatBskyGroupCreateGroup} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
@@ -88,29 +87,27 @@ export function NewChat({
       let errorMessage = l`An issue occurred starting the group chat, please try again.`
       if (isNetworkError(error)) {
         errorMessage = l`A network error occurred. Please check your internet connection.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.AccountSuspendedError
-      ) {
-        errorMessage = l`Suspended accounts cannot participate in a group chat.`
-      } else if (error instanceof ChatBskyGroupCreateGroup.BlockedActorError) {
-        errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
-      } else if (
-        error instanceof
-        ChatBskyGroupCreateGroup.NewAccountCannotCreateGroupError
-      ) {
-        errorMessage = l`You cannot create a group chat yet.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.NotFollowedBySenderError
-      ) {
-        errorMessage = l`A selected recipient is not followed by the sender.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.RecipientNotFoundError
-      ) {
-        errorMessage = l`Unable to find a selected recipient.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.UserForbidsGroupsError
-      ) {
-        errorMessage = l`One of the selected recipients does not allow group chats.`
+      } else {
+        switch (matchXrpcError(error, chat.bsky.group.createGroup)) {
+          case 'AccountSuspended':
+            errorMessage = l`Suspended accounts cannot participate in a group chat.`
+            break
+          case 'BlockedActor':
+            errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
+            break
+          case 'NewAccountCannotCreateGroup':
+            errorMessage = l`You cannot create a group chat yet.`
+            break
+          case 'NotFollowedBySender':
+            errorMessage = l`A selected recipient is not followed by the sender.`
+            break
+          case 'RecipientNotFound':
+            errorMessage = l`Unable to find a selected recipient.`
+            break
+          case 'UserForbidsGroups':
+            errorMessage = l`One of the selected recipients does not allow group chats.`
+            break
+        }
       }
       Toast.show(errorMessage, {
         type: 'error',
diff --git a/src/components/dms/dialogs/ShareViaChatDialog.tsx b/src/components/dms/dialogs/ShareViaChatDialog.tsx
index 6dfb6145f7..f26dd47a57 100644
--- a/src/components/dms/dialogs/ShareViaChatDialog.tsx
+++ b/src/components/dms/dialogs/ShareViaChatDialog.tsx
@@ -1,5 +1,4 @@
 import {useCallback, useState} from 'react'
-import {ChatBskyGroupCreateGroup} from '@atproto/api'
 import {useLingui} from '@lingui/react/macro'
 
 import {isNetworkError} from '#/lib/strings/errors'
@@ -104,29 +103,27 @@ function SendViaChatDialogInner({
       let errorMessage = l`An issue occurred starting the group chat, please try again.`
       if (isNetworkError(error)) {
         errorMessage = l`A network error occurred. Please check your internet connection.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.AccountSuspendedError
-      ) {
-        errorMessage = l`Suspended accounts cannot participate in a group chat.`
-      } else if (error instanceof ChatBskyGroupCreateGroup.BlockedActorError) {
-        errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
-      } else if (
-        error instanceof
-        ChatBskyGroupCreateGroup.NewAccountCannotCreateGroupError
-      ) {
-        errorMessage = l`You cannot create a group chat yet.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.NotFollowedBySenderError
-      ) {
-        errorMessage = l`A selected recipient is not followed by the sender.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.RecipientNotFoundError
-      ) {
-        errorMessage = l`Unable to find a selected recipient.`
-      } else if (
-        error instanceof ChatBskyGroupCreateGroup.UserForbidsGroupsError
-      ) {
-        errorMessage = l`One of the selected recipients does not allow group chats.`
+      } else {
+        switch (matchXrpcError(error, chat.bsky.group.createGroup)) {
+          case 'AccountSuspended':
+            errorMessage = l`Suspended accounts cannot participate in a group chat.`
+            break
+          case 'BlockedActor':
+            errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
+            break
+          case 'NewAccountCannotCreateGroup':
+            errorMessage = l`You cannot create a group chat yet.`
+            break
+          case 'NotFollowedBySender':
+            errorMessage = l`A selected recipient is not followed by the sender.`
+            break
+          case 'RecipientNotFound':
+            errorMessage = l`Unable to find a selected recipient.`
+            break
+          case 'UserForbidsGroups':
+            errorMessage = l`One of the selected recipients does not allow group chats.`
+            break
+        }
       }
       Toast.show(errorMessage, {
         type: 'error',
diff --git a/src/components/intents/GroupChatJoinDialog.tsx b/src/components/intents/GroupChatJoinDialog.tsx
index 7c506a634d..53782ae271 100644
--- a/src/components/intents/GroupChatJoinDialog.tsx
+++ b/src/components/intents/GroupChatJoinDialog.tsx
@@ -1,11 +1,6 @@
 import {useEffect} from 'react'
 import {View} from 'react-native'
-import {
-  ChatBskyGroupDefs,
-  ChatBskyGroupRequestJoin,
-  ChatBskyGroupWithdrawJoinRequest,
-  moderateProfile,
-} from '@atproto/api'
+import {ChatBskyGroupDefs, moderateProfile} from '@atproto/api'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -16,6 +11,7 @@ import {makeProfileLink} from '#/lib/routes/links'
 import {type NavigationProp} from '#/lib/routes/types'
 import {isNetworkError} from '#/lib/strings/errors'
 import {sanitizeHandle} from '#/lib/strings/handles'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {
@@ -49,6 +45,7 @@ import {Loader} from '#/components/Loader'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {chat} from '#/lexicons'
 import {ProfileBadges} from '../ProfileBadges'
 
 export function GroupChatJoinDialog() {
@@ -147,33 +144,37 @@ function GroupChatJoinDialogContent({code}: {code?: string}) {
         let errorMessage = l`Failed to join the group chat. Please try again.`
         if (isNetworkError(error)) {
           errorMessage = l`There was a problem with your internet connection, please try again`
-        } else if (error instanceof ChatBskyGroupRequestJoin.ConvoLockedError) {
-          errorMessage = l`This conversation is locked.`
-        } else if (
-          error instanceof ChatBskyGroupRequestJoin.FollowRequiredError
-        ) {
-          errorMessage = l`Only followers can join this group chat.`
-        } else if (error instanceof ChatBskyGroupRequestJoin.InvalidCodeError) {
-          errorMessage = l`Invalid group chat code.`
-        } else if (
-          error instanceof ChatBskyGroupRequestJoin.LinkDisabledError
-        ) {
-          errorMessage = l`This invite link has been disabled.`
-        } else if (
-          error instanceof ChatBskyGroupRequestJoin.MemberLimitReachedError
-        ) {
-          errorMessage = l`The member limit has been reached.`
-          const preview = data?.joinLinkPreviews[0]
-          if (
-            ChatBskyGroupDefs.isJoinLinkPreviewView(preview) &&
-            preview.convo?.id
-          ) {
-            ax.metric('groupchat:join:memberLimitReached', {
-              convoId: preview.convo.id,
-            })
+        } else {
+          switch (matchXrpcError(error, chat.bsky.group.requestJoin)) {
+            case 'ConvoLocked':
+              errorMessage = l`This conversation is locked.`
+              break
+            case 'FollowRequired':
+              errorMessage = l`Only followers can join this group chat.`
+              break
+            case 'InvalidCode':
+              errorMessage = l`Invalid group chat code.`
+              break
+            case 'LinkDisabled':
+              errorMessage = l`This invite link has been disabled.`
+              break
+            case 'MemberLimitReached': {
+              errorMessage = l`The member limit has been reached.`
+              const preview = data?.joinLinkPreviews[0]
+              if (
+                ChatBskyGroupDefs.isJoinLinkPreviewView(preview) &&
+                preview.convo?.id
+              ) {
+                ax.metric('groupchat:join:memberLimitReached', {
+                  convoId: preview.convo.id,
+                })
+              }
+              break
+            }
+            case 'UserKicked':
+              errorMessage = l`You have been previously removed from this group and can’t join it using this link.`
+              break
           }
-        } else if (error instanceof ChatBskyGroupRequestJoin.UserKickedError) {
-          errorMessage = l`You have been previously removed from this group and can’t join it using this link.`
         }
         Toast.show(errorMessage)
       },
@@ -194,8 +195,8 @@ function GroupChatJoinDialogContent({code}: {code?: string}) {
         if (isNetworkError(error)) {
           errorMessage = l`There was a problem with your internet connection, please try again`
         } else if (
-          error instanceof
-          ChatBskyGroupWithdrawJoinRequest.InvalidJoinRequestError
+          matchXrpcError(error, chat.bsky.group.withdrawJoinRequest) ===
+          'InvalidJoinRequest'
         ) {
           errorMessage = l`Invalid rescind request.`
         }
diff --git a/src/components/moderation/BlockDialog.tsx b/src/components/moderation/BlockDialog.tsx
index 5ec9e4d9e4..d576e071d7 100644
--- a/src/components/moderation/BlockDialog.tsx
+++ b/src/components/moderation/BlockDialog.tsx
@@ -1,6 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {type ChatBskyConvoDefs, ChatBskyGroupRemoveMembers} from '@atproto/api'
+import {type ChatBskyConvoDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -309,14 +309,15 @@ function MutualGroupChat({
         let errorMessage = l`Could not remove member.`
         if (isNetworkError(error)) {
           errorMessage = l`A network error occurred. Please check your internet connection.`
-        } else if (
-          error instanceof ChatBskyGroupRemoveMembers.InvalidConvoError
-        ) {
-          errorMessage = l`Chat not found.`
-        } else if (
-          error instanceof ChatBskyGroupRemoveMembers.InsufficientRoleError
-        ) {
-          errorMessage = l`You must be a chat owner to remove a member.`
+        } else {
+          switch (matchXrpcError(error, chat.bsky.group.removeMembers)) {
+            case 'InvalidConvo':
+              errorMessage = l`Chat not found.`
+              break
+            case 'InsufficientRole':
+              errorMessage = l`You must be a chat owner to remove a member.`
+              break
+          }
         }
         Toast.show(errorMessage, {type: 'error'})
       },
diff --git a/src/screens/Messages/JoinRequests.tsx b/src/screens/Messages/JoinRequests.tsx
index ffe3fb219e..d8d6ff9b06 100644
--- a/src/screens/Messages/JoinRequests.tsx
+++ b/src/screens/Messages/JoinRequests.tsx
@@ -1,10 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {
-  ChatBskyGroupApproveJoinRequest,
-  type ChatBskyGroupListJoinRequests,
-  ChatBskyGroupRejectJoinRequest,
-} from '@atproto/api'
+import {type ChatBskyGroupListJoinRequests} from '@atproto/api'
 import {Plural, Trans, useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type InfiniteData, useQueryClient} from '@tanstack/react-query'
@@ -16,6 +12,7 @@ import {
   type NativeStackScreenProps,
   type NavigationProp,
 } from '#/lib/routes/types'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {logger} from '#/logger'
 import {ConvoProvider, useConvo} from '#/state/messages/convo'
 import {ConvoStatus} from '#/state/messages/convo/types'
@@ -43,6 +40,7 @@ import * as ProfileCard from '#/components/ProfileCard'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
+import {chat} from '#/lexicons'
 import type * as bsky from '#/types/bsky'
 import {InviteLinkDialog} from './components/InviteLinkDialog'
 
@@ -190,19 +188,18 @@ function JoinRequestsList({
         let errorMessage = l`Failed to accept join request`
         if (isNetworkError(error)) {
           errorMessage = l`A network error occurred. Please check your internet connection.`
-        } else if (
-          error instanceof ChatBskyGroupApproveJoinRequest.InvalidConvoError
-        ) {
-          errorMessage = l`Conversation not found.`
-        } else if (
-          error instanceof ChatBskyGroupApproveJoinRequest.InsufficientRoleError
-        ) {
-          errorMessage = l`Only admins can accept join requests.`
-        } else if (
-          error instanceof
-          ChatBskyGroupApproveJoinRequest.MemberLimitReachedError
-        ) {
-          errorMessage = l`The member limit has been reached.`
+        } else {
+          switch (matchXrpcError(error, chat.bsky.group.approveJoinRequest)) {
+            case 'InvalidConvo':
+              errorMessage = l`Conversation not found.`
+              break
+            case 'InsufficientRole':
+              errorMessage = l`Only admins can accept join requests.`
+              break
+            case 'MemberLimitReached':
+              errorMessage = l`The member limit has been reached.`
+              break
+          }
         }
         Toast.show(errorMessage, {type: 'error'})
       },
@@ -223,14 +220,15 @@ function JoinRequestsList({
         let errorMessage = l`Failed to reject join request`
         if (isNetworkError(error)) {
           errorMessage = l`A network error occurred. Please check your internet connection.`
-        } else if (
-          error instanceof ChatBskyGroupRejectJoinRequest.InvalidConvoError
-        ) {
-          errorMessage = l`Conversation not found.`
-        } else if (
-          error instanceof ChatBskyGroupRejectJoinRequest.InsufficientRoleError
-        ) {
-          errorMessage = l`Only admins can reject join requests.`
+        } else {
+          switch (matchXrpcError(error, chat.bsky.group.rejectJoinRequest)) {
+            case 'InvalidConvo':
+              errorMessage = l`Conversation not found.`
+              break
+            case 'InsufficientRole':
+              errorMessage = l`Only admins can reject join requests.`
+              break
+          }
         }
         Toast.show(errorMessage, {type: 'error'})
       },
diff --git a/src/screens/Messages/components/OutgoingRequestListItem.tsx b/src/screens/Messages/components/OutgoingRequestListItem.tsx
index b5dcdf08df..eb62f24b81 100644
--- a/src/screens/Messages/components/OutgoingRequestListItem.tsx
+++ b/src/screens/Messages/components/OutgoingRequestListItem.tsx
@@ -1,11 +1,9 @@
 import {View} from 'react-native'
-import {
-  type ChatBskyGroupDefs,
-  ChatBskyGroupWithdrawJoinRequest,
-} from '@atproto/api'
+import {type ChatBskyGroupDefs} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {isNetworkError} from '#/lib/strings/errors'
+import {matchXrpcError} from '#/lib/xrpc-error'
 import {useWithdrawJoinGroupChatRequest} from '#/state/queries/messages/withdraw-join-group-chat'
 import {TimeElapsed} from '#/view/com/util/TimeElapsed'
 import {atoms as a, useTheme, web} from '#/alf'
@@ -14,6 +12,7 @@ import {createStaticClick, Link} from '#/components/Link'
 import * as Prompt from '#/components/Prompt'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {chat} from '#/lexicons'
 
 export function OutgoingRequestListItem({
   convo: convoView,
@@ -35,8 +34,8 @@ export function OutgoingRequestListItem({
         if (isNetworkError(error)) {
           errorMessage = l`There was a problem with your internet connection, please try again`
         } else if (
-          error instanceof
-          ChatBskyGroupWithdrawJoinRequest.InvalidJoinRequestError
+          matchXrpcError(error, chat.bsky.group.withdrawJoinRequest) ===
+          'InvalidJoinRequest'
         ) {
           errorMessage = l`Invalid rescind request.`
         }