diff --git a/apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx b/apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx
index 808eadae71b18..eaa6a5d6d8ce9 100644
--- a/apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx
+++ b/apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx
@@ -9,7 +9,7 @@ import AdminABACTabs from './AdminABACTabs';
 import RoomAttributesContextualBar from './RoomAttributesContextualBar';
 import RoomAttributesContextualBarWithData from './RoomAttributesContextualBarWithData';
 import useIsABACAvailable from './hooks/useIsABACAvailable';
-import { ContextualbarDialog, ContextualbarSkeletonBody } from '../../../components/Contextualbar';
+import { ContextualbarDialog } from '../../../components/Contextualbar';
 import { Page, PageContent, PageHeader } from '../../../components/Page';
 import { useExternalLink } from '../../../hooks/useExternalLink';
 import { links } from '../../../lib/links';
@@ -69,9 +69,8 @@ const AdminABACPage = ({ shouldShowWarning }: AdminABACPageProps) => {
 			</Page>
 			{tab === 'room-attributes' && context !== undefined && (
 				<ContextualbarDialog onClose={() => handleCloseContextualbar()}>
-					{isABACAvailable === 'loading' && <ContextualbarSkeletonBody />}
-					{context === 'new' && isABACAvailable === true && <RoomAttributesContextualBar onClose={() => handleCloseContextualbar()} />}
-					{context === 'edit' && _id && isABACAvailable === true && (
+					{context === 'new' && isABACAvailable && <RoomAttributesContextualBar onClose={() => handleCloseContextualbar()} />}
+					{context === 'edit' && _id && isABACAvailable && (
 						<RoomAttributesContextualBarWithData id={_id} onClose={() => handleCloseContextualbar()} />
 					)}
 				</ContextualbarDialog>
diff --git a/apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributes.tsx b/apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributes.tsx
index 6c4dcdd97347c..b013efcf7d350 100644
--- a/apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributes.tsx
+++ b/apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributes.tsx
@@ -63,7 +63,7 @@ const AdminABACRoomAttributes = () => {
 						value={text}
 						onChange={(e) => setText((e.target as HTMLInputElement).value)}
 					/>
-					<Button onClick={handleNewAttribute} primary mis={8} disabled={isABACAvailable !== true}>
+					<Button onClick={handleNewAttribute} primary mis={8} disabled={!isABACAvailable}>
 						{t('ABAC_New_attribute')}
 					</Button>
 				</Box>
diff --git a/apps/meteor/client/views/admin/ABAC/AdminABACRoute.tsx b/apps/meteor/client/views/admin/ABAC/AdminABACRoute.tsx
index 20a1db6239b81..05538b79448e5 100644
--- a/apps/meteor/client/views/admin/ABAC/AdminABACRoute.tsx
+++ b/apps/meteor/client/views/admin/ABAC/AdminABACRoute.tsx
@@ -16,7 +16,7 @@ const AdminABACRoute = (): ReactElement => {
 	const { t } = useTranslation();
 	// TODO: Check what permission is needed to view the ABAC page
 	const canViewABACPage = usePermission('abac-management');
-	const hasABAC = useHasLicenseModule('abac') === true;
+	const { data: hasABAC = false } = useHasLicenseModule('abac');
 	const isModalOpen = !!useCurrentModal();
 	const tab = useRouteParameter('tab');
 	const router = useRouter();
diff --git a/apps/meteor/client/views/admin/ABAC/AdminABACSettings.tsx b/apps/meteor/client/views/admin/ABAC/AdminABACSettings.tsx
index 3741720317692..3b3505c0dd595 100644
--- a/apps/meteor/client/views/admin/ABAC/AdminABACSettings.tsx
+++ b/apps/meteor/client/views/admin/ABAC/AdminABACSettings.tsx
@@ -6,7 +6,7 @@ import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 import { links } from '../../../lib/links';
 
 const AdminABACSettings = () => {
-	const hasABAC = useHasLicenseModule('abac');
+	const { data: hasABAC = false } = useHasLicenseModule('abac');
 	return (
 		<Box maxWidth='x600' w='full' alignSelf='center'>
 			<Box>
diff --git a/apps/meteor/client/views/admin/ABAC/hooks/useIsABACAvailable.tsx b/apps/meteor/client/views/admin/ABAC/hooks/useIsABACAvailable.tsx
index 9cb553406aaf5..abc6c945a587f 100644
--- a/apps/meteor/client/views/admin/ABAC/hooks/useIsABACAvailable.tsx
+++ b/apps/meteor/client/views/admin/ABAC/hooks/useIsABACAvailable.tsx
@@ -3,9 +3,10 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
 
 const useIsABACAvailable = () => {
-	const hasABAC = useHasLicenseModule('abac');
+	const { data: hasABAC = false } = useHasLicenseModule('abac');
 	const isABACSettingEnabled = useSetting('ABAC_Enabled', false);
-	return hasABAC === 'loading' ? 'loading' : hasABAC && isABACSettingEnabled;
+
+	return hasABAC && isABACSettingEnabled;
 };
 
 export default useIsABACAvailable;
diff --git a/apps/meteor/client/views/admin/ABAC/useRoomAttributeOptions.tsx b/apps/meteor/client/views/admin/ABAC/useRoomAttributeOptions.tsx
index a8c8169eecc66..3c67e5598d4ee 100644
--- a/apps/meteor/client/views/admin/ABAC/useRoomAttributeOptions.tsx
+++ b/apps/meteor/client/views/admin/ABAC/useRoomAttributeOptions.tsx
@@ -89,7 +89,7 @@ const useRoomAttributeItems = (attribute: { _id: string; key: string }): Generic
 	});
 
 	return [
-		{ id: 'edit', icon: 'edit' as const, content: t('Edit'), onClick: () => editAction(), disabled: isABACAvailable !== true },
+		{ id: 'edit', icon: 'edit' as const, content: t('Edit'), onClick: () => editAction(), disabled: !isABACAvailable },
 		{
 			id: 'delete',
 			iconColor: 'danger',