diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
index 050ca38f9..16835921f 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
@@ -21,7 +21,7 @@ export const SettingsNavigationDrawerItem = ({
   Icon,
   label,
   indentationLevel,
-  matchSubPages = false,
+  matchSubPages = true,
   path,
   soon,
   subItemState,
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
index e84a7d273..8ca0f3ea2 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
@@ -43,8 +43,8 @@ type SettingsNavigationItem = {
   label: string;
   path: SettingsPath;
   Icon: IconComponent;
-  matchSubPages?: boolean;
   indentationLevel?: NavigationDrawerItemIndentationLevel;
+  matchSubPages?: boolean;
 };
 
 const StyledIconContainer = styled.div`
@@ -90,14 +90,12 @@ export const SettingsNavigationDrawerItems = () => {
       label: 'Emails',
       path: SettingsPath.AccountsEmails,
       Icon: IconMail,
-      matchSubPages: true,
       indentationLevel: 2,
     },
     {
       label: 'Calendars',
       path: SettingsPath.AccountsCalendars,
       Icon: IconCalendarEvent,
-      matchSubPages: true,
       indentationLevel: 2,
     },
   ];
@@ -109,7 +107,7 @@ export const SettingsNavigationDrawerItems = () => {
     return matchPath(
       {
         path: pathName,
-        end: !accountSubSetting.matchSubPages,
+        end: !accountSubSetting.matchSubPages ?? true,
       },
       currentPathName,
     );
@@ -134,6 +132,7 @@ export const SettingsNavigationDrawerItems = () => {
             label="Accounts"
             path={SettingsPath.Accounts}
             Icon={IconAt}
+            matchSubPages={false}
           />
           {accountSubSettings.map((navigationItem, index) => (
             <SettingsNavigationDrawerItem
@@ -174,7 +173,6 @@ export const SettingsNavigationDrawerItems = () => {
           label="Data model"
           path={SettingsPath.Objects}
           Icon={IconHierarchy2}
-          matchSubPages
         />
         <SettingsNavigationDrawerItem
           label="Integrations"