diff --git a/src/components/utilities/CippTableOffcanvas.jsx b/src/components/utilities/CippTableOffcanvas.jsx
index 561d0e6839b1..236ccff04b4e 100644
--- a/src/components/utilities/CippTableOffcanvas.jsx
+++ b/src/components/utilities/CippTableOffcanvas.jsx
@@ -14,7 +14,7 @@ function CippTableOffcanvas({
   tableProps,
   data = null,
 }) {
-  if (Array.isArray(data) && data !== null && data !== undefined) {
+  if (Array.isArray(data) && data !== null && data !== undefined && data?.length > 0) {
     if (!Array.isArray(data) && typeof data === 'object') {
       data = Object.keys(data).map((key) => {
         return {
diff --git a/src/views/tenant/administration/TenantOnboardingWizard.jsx b/src/views/tenant/administration/TenantOnboardingWizard.jsx
index 874510c3517e..ebbab2a8e178 100644
--- a/src/views/tenant/administration/TenantOnboardingWizard.jsx
+++ b/src/views/tenant/administration/TenantOnboardingWizard.jsx
@@ -183,6 +183,15 @@ const TenantOnboardingWizard = () => {
           <h5 className="card-title mb-4">Tenant Onboarding Options</h5>
         </center>
         <hr className="my-4" />
+        <h5>Standards</h5>
+        <RFFCFormSwitch
+          name="standardsExcludeAllTenants"
+          helpText='Enabling this feature excludes this tenant from any top-level
+                                      "All Tenants" standard. This means that only the standards you
+                                      explicitly set for this tenant will be applied.'
+          label="Exclude this tenant from top-level standards"
+          className="mb-4"
+        />
         <h5>Optional Settings</h5>
         <p>
           Use these options for relationships created outside of the CIPP Invite Wizard or if the
@@ -257,6 +266,7 @@ const TenantOnboardingWizard = () => {
                             gdapRoles={props.values.gdapRoles}
                             autoMapRoles={props.values.autoMapRoles}
                             addMissingGroups={props.values.addMissingGroups}
+                            standardsExcludeAllTenants={props.values.standardsExcludeAllTenants}
                             key={idx}
                           />
                         ))}
diff --git a/src/views/tenant/administration/onboarding/RelationshipOnboarding.jsx b/src/views/tenant/administration/onboarding/RelationshipOnboarding.jsx
index 3f5c93f4ab12..9147caebbf63 100644
--- a/src/views/tenant/administration/onboarding/RelationshipOnboarding.jsx
+++ b/src/views/tenant/administration/onboarding/RelationshipOnboarding.jsx
@@ -40,11 +40,14 @@ function useInterval(callback, delay, state) {
   }, [delay, state])
 }
 
-const RelationshipOnboarding = ({ relationship, gdapRoles, autoMapRoles, addMissingGroups }) => {
-  const [relationshipReady, setRelationshipReady] = useState(false)
-  const [refreshGuid, setRefreshGuid] = useState(false)
+const RelationshipOnboarding = ({
+  relationship,
+  gdapRoles,
+  autoMapRoles,
+  addMissingGroups,
+  standardsExcludeAllTenants,
+}) => {
   const [getOnboardingStatus, onboardingStatus] = useLazyGenericPostRequestQuery()
-  var headerIcon = relationshipReady ? 'check-circle' : 'question-circle'
 
   useInterval(
     async () => {
@@ -58,6 +61,7 @@ const RelationshipOnboarding = ({ relationship, gdapRoles, autoMapRoles, addMiss
     5000,
     onboardingStatus.data,
   )
+  console.log(standardsExcludeAllTenants)
 
   return (
     <CAccordionItem>
@@ -125,7 +129,13 @@ const RelationshipOnboarding = ({ relationship, gdapRoles, autoMapRoles, addMiss
         {onboardingStatus.isUninitialized &&
           getOnboardingStatus({
             path: '/api/ExecOnboardTenant',
-            values: { id: relationship.id, gdapRoles, autoMapRoles, addMissingGroups },
+            values: {
+              id: relationship.id,
+              gdapRoles,
+              autoMapRoles,
+              addMissingGroups,
+              standardsExcludeAllTenants,
+            },
           })}
         {onboardingStatus.isSuccess && (
           <>
@@ -134,7 +144,13 @@ const RelationshipOnboarding = ({ relationship, gdapRoles, autoMapRoles, addMiss
                 onClick={() =>
                   getOnboardingStatus({
                     path: '/api/ExecOnboardTenant?Retry=True',
-                    values: { id: relationship.id, gdapRoles, autoMapRoles, addMissingGroups },
+                    values: {
+                      id: relationship.id,
+                      gdapRoles,
+                      autoMapRoles,
+                      addMissingGroups,
+                      standardsExcludeAllTenants,
+                    },
                   })
                 }
                 className="mb-3 me-2"
@@ -190,6 +206,7 @@ RelationshipOnboarding.propTypes = {
   autoMapRoles: PropTypes.bool,
   addMissingGroups: PropTypes.bool,
   statusOnly: PropTypes.bool,
+  standardsExcludeAllTenants: PropTypes.bool,
 }
 
 export default RelationshipOnboarding