diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.test.tsx
index acd72f54b4a..74b6e7ea96a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.test.tsx
@@ -151,7 +151,7 @@ describe('CustomNodeV1', () => {
     expect(screen.getByTestId('dbt-icon')).toBeInTheDocument();
   });
 
-  it('should render children dropdown button', () => {
+  it('should render footer only when there are children', () => {
     isColumnLayerActive = true;
     render(
       <ReactFlowProvider>
@@ -167,6 +167,65 @@ describe('CustomNodeV1', () => {
     ).toBeInTheDocument();
   });
 
+  it('should not render footer when there are no children', () => {
+    isColumnLayerActive = true;
+
+    const mockNodeDataPropsNoChildren = {
+      ...mockNodeDataProps,
+      data: {
+        node: {
+          ...mockNodeDataProps.data.node,
+          columns: [],
+        },
+      },
+    };
+
+    render(
+      <ReactFlowProvider>
+        <CustomNodeV1Component {...mockNodeDataPropsNoChildren} />
+      </ReactFlowProvider>
+    );
+
+    expect(
+      screen.queryByTestId('children-info-dropdown-btn')
+    ).not.toBeInTheDocument();
+  });
+
+  it('should render NodeChildren when column layer is applied and there are no columns', () => {
+    isColumnLayerActive = true;
+
+    render(
+      <ReactFlowProvider>
+        <CustomNodeV1Component {...mockNodeDataProps} />
+      </ReactFlowProvider>
+    );
+
+    expect(screen.getByTestId('column-container')).toBeInTheDocument();
+  });
+
+  it('should not render NodeChildren when column layer is applied but there are no columns', () => {
+    isColumnLayerActive = true;
+
+    const mockNodeDataPropsNoChildren = {
+      ...mockNodeDataProps,
+      data: {
+        node: {
+          ...mockNodeDataProps.data.node,
+          columns: [],
+        },
+      },
+    };
+
+    render(
+      <ReactFlowProvider>
+        <CustomNodeV1Component {...mockNodeDataPropsNoChildren} />
+      </ReactFlowProvider>
+    );
+    screen.debug(undefined, Infinity);
+
+    expect(screen.queryByTestId('column-container')).not.toBeInTheDocument();
+  });
+
   it('should toggle columns list when children dropdown button is clicked', () => {
     render(
       <ReactFlowProvider>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/LineageNodeLabelV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/LineageNodeLabelV1.tsx
index aa987a27342..5f35960f322 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/LineageNodeLabelV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/LineageNodeLabelV1.tsx
@@ -58,8 +58,18 @@ const EntityLabel = ({ node }: LineageNodeLabelPropsExtended) => {
     };
   }, [node]);
 
+  const { children } = useMemo(
+    () => getEntityChildrenAndLabel(node),
+    [node.id]
+  );
+  const childrenCount = children.length;
+
   return (
-    <Col className="items-center entity-label-container">
+    <Col
+      className={classNames(
+        'items-center entity-label-container',
+        childrenCount > 0 ? 'with-footer' : ''
+      )}>
       <Col className="d-flex items-center m-b-sm" flex="auto">
         <div className="d-flex entity-service-icon m-r-xs">
           {getServiceIcon(node)}
@@ -182,6 +192,10 @@ const EntityFooter = ({
     [toggleColumnsList]
   );
 
+  if (childrenCount === 0) {
+    return null;
+  }
+
   return (
     <div className="entity-footer">
       <Button
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/NodeChildren/NodeChildren.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/NodeChildren/NodeChildren.component.tsx
index 3b1f4520c91..b72b27ac753 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/NodeChildren/NodeChildren.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/NodeChildren/NodeChildren.component.tsx
@@ -306,8 +306,9 @@ const NodeChildren = ({
     (isColumnLayerEnabled || showDataObservability || isChildrenListExpanded)
   ) {
     return (
-      (isColumnLayerEnabled || isChildrenListExpanded) && (
-        <div className="column-container">
+      (isColumnLayerEnabled || isChildrenListExpanded) &&
+      !isEmpty(renderedColumns) && (
+        <div className="column-container" data-testid="column-container">
           <div className="search-box">
             <Input
               placeholder={t('label.search-entity', {
@@ -319,7 +320,7 @@ const NodeChildren = ({
               onClick={(e) => e.stopPropagation()}
             />
 
-            {isChildrenListExpanded && !isEmpty(renderedColumns) && (
+            {isChildrenListExpanded && (
               <section className="m-t-md" id="table-columns">
                 <div className="rounded-4 overflow-hidden">
                   {renderedColumns}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/custom-node.less b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/custom-node.less
index 09e3eef8554..14d168eef26 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/custom-node.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/custom-node.less
@@ -77,7 +77,6 @@
     .label-container {
       .custom-node-label-container {
         width: 100%;
-        min-height: 84px;
         .lineage-breadcrumb {
           .lineage-breadcrumb-item {
             white-space: nowrap;
@@ -104,7 +103,7 @@
             width: 28px;
           }
 
-          &::after {
+          &.with-footer::after {
             display: block;
             width: 100%;
             height: 1px;
@@ -530,7 +529,7 @@
     border-radius: 4px !important;
     border-color: @lineage-border !important;
     background: @white !important;
-    top: 60px !important;
+    top: min(58px, 50%) !important;
     left: 100%;
     transform: translate(-50%, -50%);
 
@@ -574,6 +573,7 @@
   border-color: @lineage-border !important;
   background: @white !important;
   top: 60px !important; // Need to show handles on top half
+  top: min(58px, 50%) !important;
 
   svg {
     color: @text-grey-muted;