diff --git a/apps/meteor/client/hooks/omnichannel/useMacLimitValidations.tsx b/apps/meteor/client/hooks/omnichannel/useMacLimitValidations.tsx
deleted file mode 100644
index da2bfae69d53..000000000000
--- a/apps/meteor/client/hooks/omnichannel/useMacLimitValidations.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useStream } from '@rocket.chat/ui-contexts';
-import { useEffect, useState } from 'react';
-
-import { useLicense } from '../useLicense';
-
-export const useMacLimitValidations = (enabled: boolean) => {
-	const { data: { preventedActions } = {}, isLoading, isError } = useLicense();
-	const [isOverMacLimit, setOverMacLimit] = useState(preventedActions?.monthlyActiveContacts || false);
-	const subscribe = useStream('notify-logged');
-
-	useEffect(() => {
-		if (!enabled || isLoading || isError) {
-			return;
-		}
-
-		setOverMacLimit(preventedActions?.monthlyActiveContacts ?? false);
-	}, [enabled, isError, isLoading, preventedActions?.monthlyActiveContacts]);
-
-	useEffect(() => {
-		if (!enabled) {
-			return;
-		}
-
-		return subscribe(`mac.limit`, ({ limitReached }) => {
-			setOverMacLimit(limitReached);
-		});
-	}, [subscribe, enabled]);
-
-	return { isOverMacLimit };
-};
diff --git a/apps/meteor/client/providers/OmnichannelProvider.tsx b/apps/meteor/client/providers/OmnichannelProvider.tsx
index c73e7f31797b..6e7cf38f8cd5 100644
--- a/apps/meteor/client/providers/OmnichannelProvider.tsx
+++ b/apps/meteor/client/providers/OmnichannelProvider.tsx
@@ -19,7 +19,7 @@ import { useHasLicenseModule } from '../../ee/client/hooks/useHasLicenseModule';
 import { ClientLogger } from '../../lib/ClientLogger';
 import type { OmnichannelContextValue } from '../contexts/OmnichannelContext';
 import { OmnichannelContext } from '../contexts/OmnichannelContext';
-import { useMacLimitValidations } from '../hooks/omnichannel/useMacLimitValidations';
+import { useLicense } from '../hooks/useLicense';
 import { useReactiveValue } from '../hooks/useReactiveValue';
 
 const emptyContextValue: OmnichannelContextValue = {
@@ -76,7 +76,9 @@ const OmnichannelProvider: FC = ({ children }) => {
 		enabled: isPrioritiesEnabled,
 	});
 
-	const { isOverMacLimit } = useMacLimitValidations(enabled);
+	const { data: { preventedActions } = {} } = useLicense();
+
+	const isOverMacLimit = Boolean(preventedActions?.monthlyActiveContacts);
 
 	useEffect(() => {
 		if (!isPrioritiesEnabled) {
diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
index afbd9441515a..4c51b8a3615b 100644
--- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -170,7 +170,7 @@ function SideBarItemTemplateWithData({
 					{unread + tunread?.length}
 				</Badge>
 			)}
-			<OmnichannelBadges room={room} />
+			{isOmnichannelRoom(room) && <OmnichannelBadges room={room} />}
 		</Margins>
 	);