diff --git a/public/apps/account/account-nav-button.tsx b/public/apps/account/account-nav-button.tsx
index 0b95f928c..1100e9f31 100644
--- a/public/apps/account/account-nav-button.tsx
+++ b/public/apps/account/account-nav-button.tsx
@@ -66,7 +66,8 @@ export function AccountNavButton(props: {
     [props.config, props.coreStart]
   );
 
-  if (getShouldShowTenantPopup()) {
+  // Check if the tenant modal should be shown on load
+  if (props.config.multitenancy.enabled && getShouldShowTenantPopup()) {
     setShouldShowTenantPopup(false);
     showTenantSwitchPanel();
   }