diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsContainer.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsContainer.tsx
index 10e7017d5..16b1255ff 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsContainer.tsx
@@ -70,7 +70,8 @@ export const SettingsAccountsCalendarChannelsContainer = () => {
       )}
       {calendarChannels.map((calendarChannel) => (
         <React.Fragment key={calendarChannel.id}>
-          {calendarChannel.id === activeTabId && (
+          {(calendarChannels.length === 1 ||
+            calendarChannel.id === activeTabId) && (
             <SettingsAccountsCalendarChannelDetails
               calendarChannel={calendarChannel}
             />
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsContainer.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsContainer.tsx
index 24a5f62fa..3bbe93deb 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelsContainer.tsx
@@ -69,7 +69,8 @@ export const SettingsAccountsMessageChannelsContainer = () => {
       )}
       {messageChannels.map((messageChannel) => (
         <React.Fragment key={messageChannel.id}>
-          {messageChannel.id === activeTabId && (
+          {(messageChannels.length === 1 ||
+            messageChannel.id === activeTabId) && (
             <SettingsAccountsMessageChannelDetails
               messageChannel={messageChannel}
             />