diff --git a/src/components/Tenant/TenanatSkeleton.jsx b/src/components/Tenant/TenanatSkeleton.jsx
index 9d48529e..86492342 100644
--- a/src/components/Tenant/TenanatSkeleton.jsx
+++ b/src/components/Tenant/TenanatSkeleton.jsx
@@ -14,7 +14,7 @@ const SkeletonCell = ({ width = "100%", height = 20, style = {} }) => (
 
 export const TenantTableSkeleton = ({ columns, rows = 5 }) => {
   return (
-    <div className="card p-2 mt-3">
+    <div className="p-2 mt-3">
       <div className="card-datatable text-nowrap table-responsive">
         <table className="table border-top dataTable text-nowrap">
           <thead>
diff --git a/src/components/Tenant/TenantsList.jsx b/src/components/Tenant/TenantsList.jsx
index cc039890..6269a248 100644
--- a/src/components/Tenant/TenantsList.jsx
+++ b/src/components/Tenant/TenantsList.jsx
@@ -137,7 +137,7 @@ const TenantsList = ({
   return (
     <>
       <div className="p-2 mt-3">
-        <div className="card-datatable text-nowrap table-responsive">
+        <div className=" text-nowrap table-responsive">
           <table className="table border-top dataTable text-nowrap">
             <thead>
               <tr className="shadow-sm">
diff --git a/src/components/master/Services/ServicesGroups.jsx b/src/components/master/Services/ServicesGroups.jsx
index d135b052..4cc94648 100644
--- a/src/components/master/Services/ServicesGroups.jsx
+++ b/src/components/master/Services/ServicesGroups.jsx
@@ -81,8 +81,8 @@ const ServiceGroups = ({ service }) => {
             ) : (
               <div className="accordion-body text-start m-0 p-0">
                 <div className="dropdown-divider border"></div>
-
-                {groups?.data?.map((group) => {
+              {!isLoading && groups?.data?.length === 0 && (<div className="text-center py-2"><p>No Group available.</p></div>)}
+                {groups && groups?.data?.map((group) => {
                   const isOpen = activeGroupId === group.id;
 
                   return (