diff --git a/portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx b/portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx
index 191634af8..08a0dbcea 100644
--- a/portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx
+++ b/portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx
@@ -112,7 +112,7 @@ const AddTenant = () => {
   };
 
   const createButton: IWizardButton = {
-    componentRender: <CreateTenantButton />,
+    componentRender: <CreateTenantButton key={"create-tenant"} />,
   };
 
   const wizardSteps: IWizardElement[] = [
diff --git a/portal-ui/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts b/portal-ui/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts
index 9e26bc64d..086c5f97d 100644
--- a/portal-ui/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts
+++ b/portal-ui/src/screens/Console/Tenants/AddTenant/createTenantSlice.ts
@@ -908,6 +908,10 @@ export const createTenantSlice = createSlice({
         const elements: IQuotaElement[] = get(action.payload, "elements", []);
         state.limitSize = getLimitSizes(action.payload!);
 
+        if (elements === null || elements.length === 0) {
+          state.validationErrors["namespace"] = "No storage classes available.";
+          return;
+        }
         const newStorage = elements.map((storageClass: any) => {
           const name = get(storageClass, "name", "").split(
             ".storageclass.storage.k8s.io/requests.storage"
@@ -917,7 +921,6 @@ export const createTenantSlice = createSlice({
         });
 
         state.storageClasses = newStorage;
-
         const stExists = newStorage.findIndex(
           (storageClass) =>
             storageClass.value === state.fields.nameTenant.selectedStorageClass
diff --git a/portal-ui/src/screens/Console/Tenants/ListTenants/utils.ts b/portal-ui/src/screens/Console/Tenants/ListTenants/utils.ts
index 5c6a592dc..f67b3dac5 100644
--- a/portal-ui/src/screens/Console/Tenants/ListTenants/utils.ts
+++ b/portal-ui/src/screens/Console/Tenants/ListTenants/utils.ts
@@ -61,6 +61,9 @@ export const ecListTransform = (
 
 export const getLimitSizes = (resourceQuotas: IQuotas) => {
   const quotas: IQuotaElement[] = get(resourceQuotas, "elements", []);
+  if (quotas === null) {
+    return {};
+  }
 
   const returnQuotas: any = {};