diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.test.tsx
index 23e5716d737..d21604ae6ab 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.test.tsx
@@ -15,6 +15,7 @@ import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
 import ContainerChildren from './ContainerChildren';
 
+const mockFetchChildren = jest.fn();
 const mockChildrenList = [
   {
     id: '1',
@@ -32,11 +33,26 @@ const mockChildrenList = [
   },
 ];
 
+const mockDataProps = {
+  childrenList: mockChildrenList,
+  fetchChildren: mockFetchChildren,
+};
+
 describe('ContainerChildren', () => {
+  it('Should call fetch container function on load', () => {
+    render(
+      <BrowserRouter>
+        <ContainerChildren {...mockDataProps} />
+      </BrowserRouter>
+    );
+
+    expect(mockFetchChildren).toHaveBeenCalled();
+  });
+
   it('Should render table with correct columns', () => {
     render(
       <BrowserRouter>
-        <ContainerChildren childrenList={mockChildrenList} />
+        <ContainerChildren {...mockDataProps} />
       </BrowserRouter>
     );
 
@@ -48,7 +64,7 @@ describe('ContainerChildren', () => {
   it('Should render container names as links', () => {
     render(
       <BrowserRouter>
-        <ContainerChildren childrenList={mockChildrenList} />
+        <ContainerChildren {...mockDataProps} />
       </BrowserRouter>
     );
 
@@ -68,7 +84,7 @@ describe('ContainerChildren', () => {
   it('Should render container descriptions as rich text', () => {
     render(
       <BrowserRouter>
-        <ContainerChildren childrenList={mockChildrenList} />
+        <ContainerChildren {...mockDataProps} />
       </BrowserRouter>
     );
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx
index a6ce725514c..5ad9324e7a3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx
@@ -18,7 +18,7 @@ import Table from 'components/common/Table/Table';
 import { getContainerDetailPath } from 'constants/constants';
 import { Container } from 'generated/entity/data/container';
 import { EntityReference } from 'generated/type/entityReference';
-import React, { FC, useMemo } from 'react';
+import React, { FC, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { getEntityName } from 'utils/EntityUtils';
@@ -26,11 +26,13 @@ import { getEntityName } from 'utils/EntityUtils';
 interface ContainerChildrenProps {
   childrenList: Container['children'];
   isLoading?: boolean;
+  fetchChildren: () => void;
 }
 
 const ContainerChildren: FC<ContainerChildrenProps> = ({
   childrenList,
   isLoading,
+  fetchChildren,
 }) => {
   const { t } = useTranslation();
 
@@ -72,6 +74,10 @@ const ContainerChildren: FC<ContainerChildrenProps> = ({
     []
   );
 
+  useEffect(() => {
+    fetchChildren();
+  }, []);
+
   return (
     <Table
       bordered
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx
index 670da03ecf6..9eff2cb2a92 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx
@@ -45,7 +45,7 @@ import { CreateThread, ThreadType } from 'generated/api/feed/createThread';
 import { Container } from 'generated/entity/data/container';
 import { Include } from 'generated/type/include';
 import { LabelType, State, TagLabel, TagSource } from 'generated/type/tagLabel';
-import { isUndefined, omitBy, toString } from 'lodash';
+import { isEmpty, isUndefined, omitBy, toString } from 'lodash';
 import { observer } from 'mobx-react';
 import { EntityTags } from 'Models';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
@@ -79,7 +79,7 @@ const ContainerPage = () => {
   const { t } = useTranslation();
   const { getEntityPermissionByFqn } = usePermissionProvider();
   const { postFeed, deleteFeed, updateFeed } = useActivityFeedProvider();
-  const { entityFQN: containerName, tab = EntityTabs.SCHEMA } =
+  const { entityFQN: containerName, tab } =
     useParams<{ entityFQN: string; tab: EntityTabs }>();
 
   // Local states
@@ -130,10 +130,10 @@ const ContainerPage = () => {
     }
   };
 
-  const fetchContainerChildren = async (containerFQN: string) => {
+  const fetchContainerChildren = async () => {
     setIsChildrenLoading(true);
     try {
-      const { children } = await getContainerByName(containerFQN, 'children');
+      const { children } = await getContainerByName(containerName, 'children');
       setContainerChildrenData(children);
     } catch (error) {
       showErrorToast(error as AxiosError);
@@ -218,6 +218,11 @@ const ContainerPage = () => {
     [AppState.userDetails, AppState.nonSecureUserDetails]
   );
 
+  const isDataModelEmpty = useMemo(
+    () => isEmpty(containerData?.dataModel),
+    [containerData]
+  );
+
   const getEntityFeedCount = () => {
     getFeedCounts(EntityType.CONTAINER, containerName, setFeedCount);
   };
@@ -484,8 +489,13 @@ const ContainerPage = () => {
   const tabs = useMemo(
     () => [
       {
-        label: <TabsLabel id={EntityTabs.SCHEMA} name={t('label.schema')} />,
-        key: EntityTabs.SCHEMA,
+        label: (
+          <TabsLabel
+            id={isDataModelEmpty ? EntityTabs.CHILDREN : EntityTabs.SCHEMA}
+            name={t(isDataModelEmpty ? 'label.children' : 'label.schema')}
+          />
+        ),
+        key: isDataModelEmpty ? EntityTabs.CHILDREN : EntityTabs.SCHEMA,
         children: (
           <Row gutter={[0, 16]} wrap={false}>
             <Col className="p-t-sm m-x-lg" flex="auto">
@@ -505,15 +515,23 @@ const ContainerPage = () => {
                   onThreadLinkSelect={onThreadLinkSelect}
                 />
 
-                <ContainerDataModel
-                  dataModel={containerData?.dataModel}
-                  entityFqn={containerName}
-                  hasDescriptionEditAccess={hasEditDescriptionPermission}
-                  hasTagEditAccess={hasEditTagsPermission}
-                  isReadOnly={Boolean(deleted)}
-                  onThreadLinkSelect={onThreadLinkSelect}
-                  onUpdate={handleUpdateDataModel}
-                />
+                {isDataModelEmpty ? (
+                  <ContainerChildren
+                    childrenList={containerChildrenData}
+                    fetchChildren={fetchContainerChildren}
+                    isLoading={isChildrenLoading}
+                  />
+                ) : (
+                  <ContainerDataModel
+                    dataModel={containerData?.dataModel}
+                    entityFqn={containerName}
+                    hasDescriptionEditAccess={hasEditDescriptionPermission}
+                    hasTagEditAccess={hasEditTagsPermission}
+                    isReadOnly={Boolean(deleted)}
+                    onThreadLinkSelect={onThreadLinkSelect}
+                    onUpdate={handleUpdateDataModel}
+                  />
+                )}
               </div>
             </Col>
             <Col
@@ -550,6 +568,31 @@ const ContainerPage = () => {
           </Row>
         ),
       },
+      ...(isDataModelEmpty
+        ? []
+        : [
+            {
+              label: (
+                <TabsLabel
+                  id={EntityTabs.CHILDREN}
+                  name={t('label.children')}
+                />
+              ),
+              key: EntityTabs.CHILDREN,
+              children: (
+                <Row className="p-md" gutter={[0, 16]}>
+                  <Col span={24}>
+                    <ContainerChildren
+                      childrenList={containerChildrenData}
+                      fetchChildren={fetchContainerChildren}
+                      isLoading={isChildrenLoading}
+                    />
+                  </Col>
+                </Row>
+              ),
+            },
+          ]),
+
       {
         label: (
           <TabsLabel
@@ -569,23 +612,6 @@ const ContainerPage = () => {
           />
         ),
       },
-      {
-        label: (
-          <TabsLabel id={EntityTabs.CHILDREN} name={t('label.children')} />
-        ),
-        key: EntityTabs.CHILDREN,
-        children: (
-          <Row className="p-md" gutter={[0, 16]}>
-            <Col span={24}>
-              <ContainerChildren
-                childrenList={containerChildrenData}
-                isLoading={isChildrenLoading}
-              />
-            </Col>
-          </Row>
-        ),
-      },
-
       {
         label: <TabsLabel id={EntityTabs.LINEAGE} name={t('label.lineage')} />,
         key: EntityTabs.LINEAGE,
@@ -619,6 +645,7 @@ const ContainerPage = () => {
       },
     ],
     [
+      isDataModelEmpty,
       containerData,
       description,
       containerName,
@@ -667,12 +694,6 @@ const ContainerPage = () => {
     fetchResourcePermission(containerName);
   }, [containerName]);
 
-  useEffect(() => {
-    if (tab === EntityTabs.CHILDREN && hasViewPermission) {
-      fetchContainerChildren(containerName);
-    }
-  }, [tab, containerName, hasViewPermission]);
-
   useEffect(() => {
     if (hasViewPermission) {
       getEntityFeedCount();
@@ -723,7 +744,10 @@ const ContainerPage = () => {
         </Col>
         <Col span={24}>
           <Tabs
-            activeKey={tab ?? EntityTabs.DETAILS}
+            activeKey={
+              tab ??
+              (isDataModelEmpty ? EntityTabs.CHILDREN : EntityTabs.SCHEMA)
+            }
             className="entity-details-page-tabs"
             data-testid="tabs"
             items={tabs}