diff --git a/RoleMembersModal.tsx b/RoleMembersModal.tsx
index da8d950..3ef6cb4 100644
--- a/RoleMembersModal.tsx
+++ b/RoleMembersModal.tsx
@@ -5,7 +5,8 @@
  */
 
 import { classNameFactory } from "@api/Styles";
-import { ModalCloseButton, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { ModalCloseButton, ModalContent, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { Forms, Parser } from "@webpack/common";
 import { GuildMember } from "discord-types/general";
 
@@ -14,26 +15,29 @@ const cl = classNameFactory("vc-inrole-");
 export function showInRoleModal(members: GuildMember[], roleId: string, channelId: string) {
     openModal(props =>
         <>
-
-            <ModalRoot {...props} size={ModalSize.DYNAMIC} fullscreenOnMobile={true}>
-                <ModalHeader className={cl("header")}>
-                    <Forms.FormText style={{ fontSize: "1.2rem", fontWeight: "bold", marginRight: "7px" }}>Members of role {
-                        Parser.parse(`<@&${roleId}>`, true, { channelId, viewingChannelId: channelId })
-                    } ({members.length})</Forms.FormText>
-                    <ModalCloseButton onClick={props.onClose} className={cl("close")} />
-                </ModalHeader>
-                <div style={{ padding: "13px 20px" }} className={cl("member-list")}>
-                    {
-                        members.length !== 0 ? members.map(member =>
-                            <>
-                                <Forms.FormText className={cl("modal-member")}>
-                                    {Parser.parse(`<@${member.userId}>`, true, { channelId, viewingChannelId: channelId })}
-                                </Forms.FormText>
-                            </>
-                        ) : <Forms.FormText>Looks like no online cached members with that role were found. Try scrolling down on your member list to cache more users!</Forms.FormText>
-                    }
-                </div>
-            </ModalRoot>
+            <ErrorBoundary>
+                <ModalRoot {...props} size={ModalSize.DYNAMIC} fullscreenOnMobile={true} >
+                    <ModalHeader className={cl("header")}>
+                        <Forms.FormText style={{ fontSize: "1.2rem", fontWeight: "bold", marginRight: "7px" }}>Members of role {
+                            Parser.parse(`<@&${roleId}>`, true, { channelId, viewingChannelId: channelId })
+                        } ({members.length})</Forms.FormText>
+                        <ModalCloseButton onClick={props.onClose} className={cl("close")} />
+                    </ModalHeader>
+                    <ModalContent>
+                        <div style={{ padding: "13px 20px" }} className={cl("member-list")}>
+                            {
+                                members.length !== 0 ? members.map(member =>
+                                    <>
+                                        <Forms.FormText className={cl("modal-member")}>
+                                            {Parser.parse(`<@${member.userId}>`, true, { channelId, viewingChannelId: channelId })}
+                                        </Forms.FormText>
+                                    </>
+                                ) : <Forms.FormText>Looks like no online cached members with that role were found. Try scrolling down on your member list to cache more users!</Forms.FormText>
+                            }
+                        </div>
+                    </ModalContent>
+                </ModalRoot>
+            </ErrorBoundary>
         </>
     );
 }