diff --git a/packages/client/src/components/EmptyContainer/index.js b/packages/client/src/components/EmptyContainer/index.js
index c098443128..3abb285a6b 100644
--- a/packages/client/src/components/EmptyContainer/index.js
+++ b/packages/client/src/components/EmptyContainer/index.js
@@ -56,6 +56,7 @@ const EmptyContainer = ({
   isRoot,
   isPublicRoom,
   isEmptyPage,
+  isWarningRoomsDialog,
 }) => {
   //const location = useLocation();
 
diff --git a/packages/shared/store/CurrentQuotaStore.ts b/packages/shared/store/CurrentQuotaStore.ts
index 6ad3ed1a8f..2b5eeed98d 100644
--- a/packages/shared/store/CurrentQuotaStore.ts
+++ b/packages/shared/store/CurrentQuotaStore.ts
@@ -244,6 +244,9 @@ class CurrentQuotasStore {
   }
 
   get isRoomsTariffAlmostLimit() {
+    if (this.maxCountRoomsByQuota === PortalFeaturesLimitations.Limitless)
+      return false;
+
     return (
       this.maxCountRoomsByQuota - this.usedRoomsCount <=
         COUNT_FOR_SHOWING_BAR && this.usedRoomsCount < this.maxCountRoomsByQuota
@@ -251,6 +254,9 @@ class CurrentQuotasStore {
   }
 
   get isRoomsTariffLimit() {
+    if (this.maxCountRoomsByQuota === PortalFeaturesLimitations.Limitless)
+      return false;
+
     return (
       this.maxCountRoomsByQuota - this.usedRoomsCount <=
         COUNT_FOR_SHOWING_BAR &&
@@ -259,6 +265,9 @@ class CurrentQuotasStore {
   }
 
   get isStorageTariffAlmostLimit() {
+    if (this.maxTotalSizeByQuota === PortalFeaturesLimitations.Limitless)
+      return false;
+
     return (
       (this.usedTotalStorageSizeCount / this.maxTotalSizeByQuota) * 100 >=
         PERCENTAGE_FOR_SHOWING_BAR &&
@@ -267,6 +276,9 @@ class CurrentQuotasStore {
   }
 
   get isStorageTariffLimit() {
+    if (this.maxTotalSizeByQuota === PortalFeaturesLimitations.Limitless)
+      return false;
+
     return (
       (this.usedTotalStorageSizeCount / this.maxTotalSizeByQuota) * 100 >=
         PERCENTAGE_FOR_SHOWING_BAR &&
@@ -302,6 +314,9 @@ class CurrentQuotasStore {
   }
 
   get isUserTariffAlmostLimit() {
+    if (this.maxCountManagersByQuota === PortalFeaturesLimitations.Limitless)
+      return false;
+
     return (
       this.addedManagersCount > 1 &&
       this.maxCountManagersByQuota - this.addedManagersCount <=
@@ -311,6 +326,9 @@ class CurrentQuotasStore {
   }
 
   get isUserTariffLimit() {
+    if (this.maxCountManagersByQuota === PortalFeaturesLimitations.Limitless)
+      return false;
+
     return this.isPaidUserLimit;
   }