diff --git a/js/apps/admin-ui/src/clients/routes/ClientRole.tsx b/js/apps/admin-ui/src/clients/routes/ClientRole.tsx
index db118707ec..5c946c6fd4 100644
--- a/js/apps/admin-ui/src/clients/routes/ClientRole.tsx
+++ b/js/apps/admin-ui/src/clients/routes/ClientRole.tsx
@@ -23,7 +23,7 @@ export const ClientRoleRoute: AppRouteObject = {
   element: <RealmRoleTabs />,
   breadcrumb: (t) => t("roles:roleDetails"),
   handle: {
-    access: "view-realm",
+    access: "view-clients",
   },
 } satisfies AppRouteObject;
 
diff --git a/js/apps/admin-ui/src/components/role-mapping/AddRoleMappingModal.tsx b/js/apps/admin-ui/src/components/role-mapping/AddRoleMappingModal.tsx
index f78316b0f7..6bbd13f43a 100644
--- a/js/apps/admin-ui/src/components/role-mapping/AddRoleMappingModal.tsx
+++ b/js/apps/admin-ui/src/components/role-mapping/AddRoleMappingModal.tsx
@@ -11,6 +11,7 @@ import { FilterIcon } from "@patternfly/react-icons";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
+import { useAccess } from "../../context/access/Access";
 import useLocaleSort from "../../utils/useLocaleSort";
 import { ListEmptyState } from "../list-empty-state/ListEmptyState";
 import { KeycloakDataTable } from "../table-toolbar/KeycloakDataTable";
@@ -40,10 +41,14 @@ export const AddRoleMappingModal = ({
   onClose,
 }: AddRoleMappingModalProps) => {
   const { t } = useTranslation(type);
+  const { hasAccess } = useAccess();
+  const canViewRealmRoles = hasAccess("view-realm");
 
   const [searchToggle, setSearchToggle] = useState(false);
 
-  const [filterType, setFilterType] = useState<FilterType>("roles");
+  const [filterType, setFilterType] = useState<FilterType>(
+    canViewRealmRoles ? "roles" : "clients"
+  );
   const [selectedRows, setSelectedRows] = useState<Row[]>([]);
   const [key, setKey] = useState(0);
   const refresh = () => setKey(key + 1);
@@ -137,34 +142,36 @@ export const AddRoleMappingModal = ({
         searchPlaceholderKey="clients:searchByRoleName"
         isPaginated={!(filterType === "roles" && type !== "roles")}
         searchTypeComponent={
-          <ToolbarItem>
-            <Dropdown
-              onSelect={() => {
-                setFilterType(filterType === "roles" ? "clients" : "roles");
-                setSearchToggle(false);
-                refresh();
-              }}
-              data-testid="filter-type-dropdown"
-              toggle={
-                <DropdownToggle
-                  onToggle={setSearchToggle}
-                  icon={<FilterIcon />}
-                >
-                  {filterType === "roles"
-                    ? t("common:filterByRoles")
-                    : t("common:filterByClients")}
-                </DropdownToggle>
-              }
-              isOpen={searchToggle}
-              dropdownItems={[
-                <DropdownItem key="filter-type" data-testid={filterType}>
-                  {filterType === "roles"
-                    ? t("common:filterByClients")
-                    : t("common:filterByRoles")}
-                </DropdownItem>,
-              ]}
-            />
-          </ToolbarItem>
+          canViewRealmRoles && (
+            <ToolbarItem>
+              <Dropdown
+                onSelect={() => {
+                  setFilterType(filterType === "roles" ? "clients" : "roles");
+                  setSearchToggle(false);
+                  refresh();
+                }}
+                data-testid="filter-type-dropdown"
+                toggle={
+                  <DropdownToggle
+                    onToggle={setSearchToggle}
+                    icon={<FilterIcon />}
+                  >
+                    {filterType === "roles"
+                      ? t("common:filterByRoles")
+                      : t("common:filterByClients")}
+                  </DropdownToggle>
+                }
+                isOpen={searchToggle}
+                dropdownItems={[
+                  <DropdownItem key="filter-type" data-testid={filterType}>
+                    {filterType === "roles"
+                      ? t("common:filterByClients")
+                      : t("common:filterByRoles")}
+                  </DropdownItem>,
+                ]}
+              />
+            </ToolbarItem>
+          )
         }
         canSelectAll
         isRadio={isRadio}
diff --git a/js/apps/admin-ui/src/components/roles-list/RolesList.tsx b/js/apps/admin-ui/src/components/roles-list/RolesList.tsx
index 11973c7f1f..7c676e0ec4 100644
--- a/js/apps/admin-ui/src/components/roles-list/RolesList.tsx
+++ b/js/apps/admin-ui/src/components/roles-list/RolesList.tsx
@@ -33,7 +33,6 @@ const RoleDetailLink = ({
 }: RoleDetailLinkProps) => {
   const { t } = useTranslation(messageBundle);
   const { realm } = useRealm();
-
   return role.name !== defaultRoleName ? (
     <Link to={toDetail(role.id!)}>{role.name}</Link>
   ) : (
@@ -107,7 +106,7 @@ export const RolesList = ({
           ]);
         }
         setSelectedRole(undefined);
-        addAlert(t("roleDeletedSuccess"), AlertVariant.success);
+        addAlert(t("roles:roleDeletedSuccess"), AlertVariant.success);
       } catch (error) {
         addError("roles:roleDeleteError", error);
       }
@@ -145,7 +144,10 @@ export const RolesList = ({
                   title: t("common:delete"),
                   onRowClick: (role) => {
                     setSelectedRole(role);
-                    if (role.name === realm!.defaultRole!.name) {
+                    if (
+                      realm!.defaultRole &&
+                      role.name === realm!.defaultRole!.name
+                    ) {
                       addAlert(
                         t("defaultRoleDeleteError"),
                         AlertVariant.danger
diff --git a/js/apps/admin-ui/src/realm-roles/RealmRoleTabs.tsx b/js/apps/admin-ui/src/realm-roles/RealmRoleTabs.tsx
index 3d7a6e4146..48740d9503 100644
--- a/js/apps/admin-ui/src/realm-roles/RealmRoleTabs.tsx
+++ b/js/apps/admin-ui/src/realm-roles/RealmRoleTabs.tsx
@@ -300,7 +300,7 @@ export default function RealmRoleTabs() {
   };
 
   const isDefaultRole = (name: string | undefined) =>
-    realm?.defaultRole!.name === name;
+    realm?.defaultRole && realm.defaultRole!.name === name;
 
   if (!realm) {
     return <KeycloakSpinner />;