Avoid null site access when navigating from site settings to /sites (#…

…96902)
Automattic · Dec 11, 2024 · 511fa7a · 511fa7a
1 parent 1ebd264
commit 511fa7a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/client/my-sites/site-settings/section-general.jsx b/client/my-sites/site-settings/section-general.jsx
@@ -14,12 +14,12 @@ import { SOURCE_SETTINGS_GENERAL } from './site-tools/utils';
 
 const SiteSettingsGeneral = ( { site, isWPForTeamsSite, isP2Hub, isWpcomStagingSite } ) => (
 	<div className="site-settings__main general-settings">
-		<GeneralForm site={ site } />
+		{ site && <GeneralForm site={ site } /> }
 		{ isWPForTeamsSite && isP2Hub && <P2PreapprovedDomainsForm siteId={ site?.ID } /> }
 		{ ! isWpcomStagingSite && ! isEnabled( 'untangling/hosting-menu' ) && (
 			<SiteTools headerTitle={ translate( 'Site tools' ) } source={ SOURCE_SETTINGS_GENERAL } />
 		) }
-		{ isEnabled( 'untangling/hosting-menu' ) && (
+		{ isEnabled( 'untangling/hosting-menu' ) && site && (
 			<Notice
 				showDismiss={ false }
 				status="is-info"