diff --git a/packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts b/packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts
index 26ddad277a9..40f58eaa659 100644
--- a/packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts
+++ b/packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts
@@ -45,6 +45,7 @@ const styles = ({ parameters }: JSSTheme) => ({
       backgroundColor: parameters.sapUiListHeaderBackground
     }
   },
+  emptyRow: {},
   tr: {
     zIndex: 0,
     backgroundColor: parameters.sapUiListBackground,
@@ -67,11 +68,11 @@ const styles = ({ parameters }: JSSTheme) => ({
     }
   },
   selectable: {
-    '& $tr:hover': {
+    '& $tr:hover:not($emptyRow)': {
       backgroundColor: parameters.sapUiListHoverBackground,
       cursor: 'pointer'
     },
-    '& $tr:active:not([data-is-selected]):not($tableGroupHeader)': {
+    '& $tr:active:not([data-is-selected]):not($tableGroupHeader):not($emptyRow)': {
       backgroundColor: parameters.sapUiListActiveBackground,
       '& $tableCell': {
         borderRight: `1px solid ${parameters.sapUiListActiveBackground}`,
diff --git a/packages/main/src/components/AnalyticalTable/__snapshots__/AnalyticalTable.test.tsx.snap b/packages/main/src/components/AnalyticalTable/__snapshots__/AnalyticalTable.test.tsx.snap
index 8865aa79ae0..c76bd8514d3 100644
--- a/packages/main/src/components/AnalyticalTable/__snapshots__/AnalyticalTable.test.tsx.snap
+++ b/packages/main/src/components/AnalyticalTable/__snapshots__/AnalyticalTable.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`AnalyticalTable Alternate Row Color 1`] = `
     class="AnalyticalTable--tableContainer-"
   >
     <div
-      aria-rowcount="2"
+      aria-rowcount="5"
       class="AnalyticalTable--table-"
       role="table"
     >
@@ -414,58 +414,145 @@ exports[`AnalyticalTable Alternate Row Color 1`] = `
             </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="2"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 88px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="3"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 132px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="4"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 176px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -490,7 +577,7 @@ exports[`AnalyticalTable Loading - Loader 1`] = `
     class="AnalyticalTable--tableContainer-"
   >
     <div
-      aria-rowcount="2"
+      aria-rowcount="5"
       class="AnalyticalTable--table-"
       role="table"
     >
@@ -888,58 +975,145 @@ exports[`AnalyticalTable Loading - Loader 1`] = `
             </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="2"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 88px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="3"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 132px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="4"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 176px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -964,7 +1138,7 @@ exports[`AnalyticalTable Loading - Placeholder 1`] = `
     class="AnalyticalTable--tableContainer-"
   >
     <div
-      aria-rowcount="0"
+      aria-rowcount="5"
       class="AnalyticalTable--table-"
       role="table"
     >
@@ -1243,312 +1417,329 @@ exports[`AnalyticalTable Loading - Placeholder 1`] = `
           />
         </div>
       </header>
-      <svg
-        aria-label="Loading interface..."
-        preserveAspectRatio="none"
-        role="img"
-        style="width: 100%; height: 220px;"
-        viewBox="0 0 260 220"
-      >
-        <title>
-          Loading interface...
-        </title>
-        <rect
-          clip-path="CLIP-PATH-URL"
-          height="220"
-          style="fill: url(#STYLE-URL);"
-          width="260"
-          x="0"
-          y="0"
-        />
-        <defs>
-          <clipPath
-            id="CLIP-PATH-URL"
-          >
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="2"
-              y="22"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="67"
-              y="22"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="132"
-              y="22"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="197"
-              y="22"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="2"
-              y="66"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="67"
-              y="66"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="132"
-              y="66"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="197"
-              y="66"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="2"
-              y="110"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="67"
-              y="110"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="132"
-              y="110"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="197"
-              y="110"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="2"
-              y="154"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="67"
-              y="154"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="132"
-              y="154"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="197"
-              y="154"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="2"
-              y="198"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="67"
-              y="198"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="132"
-              y="198"
-            />
-            <rect
-              height="16"
-              rx="2"
-              ry="8"
-              width="61"
-              x="197"
-              y="198"
-            />
-          </clipPath>
-          <linearGradient
-            id="STYLE-URL"
-          >
-            <stop
-              offset="0%"
-              stop-color="var(--sapUiContentImagePlaceholderBackground)"
-              stop-opacity="var(--sapUiContentDisabledOpacity)"
-            >
-              <animate
-                attributeName="offset"
-                dur="2s"
-                keyTimes="0; 0.25; 1"
-                repeatCount="indefinite"
-                values="-2; -2; 1"
-              />
-            </stop>
-            <stop
-              offset="50%"
-              stop-color="var(--sapUiFieldPlaceholderTextColor)"
-              stop-opacity="1"
-            >
-              <animate
-                attributeName="offset"
-                dur="2s"
-                keyTimes="0; 0.25; 1"
-                repeatCount="indefinite"
-                values="-1; -1; 2"
-              />
-            </stop>
-            <stop
-              offset="100%"
-              stop-color="var(--sapUiContentImagePlaceholderBackground)"
-              stop-opacity="var(--sapUiContentDisabledOpacity)"
-            >
-              <animate
-                attributeName="offset"
-                dur="2s"
-                keyTimes="0; 0.25; 1"
-                repeatCount="indefinite"
-                values="0; 0; 3"
-              />
-            </stop>
-          </linearGradient>
-        </defs>
-      </svg>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`AnalyticalTable Tree Table 1`] = `
-<div>
-  <div
-    style="min-height: 1.5rem; display: flex; align-items: center;"
-  >
-    <ui5-title
-      class=""
-      level="H2"
-    >
-      Table Title
-    </ui5-title>
-  </div>
-  <div
-    class="AnalyticalTable--tableContainer-"
-  >
-    <div
-      aria-rowcount="2"
-      class="AnalyticalTable--table-"
-      role="table"
-    >
-      <header
-        class="AnalyticalTable--tableHeaderRow-"
-        role="rowgroup"
-        style="position: relative; width: 240px;"
+      <div
+        class="AnalyticalTable--virtualTableBody-"
+        style="position: relative; height: 220px; width: 240px; overflow: auto; will-change: transform; direction: ltr;"
       >
         <div
-          class="AnalyticalTable--th-"
-          id="name"
-          role="columnheader"
-          style="position: absolute; top: 0px; left: 0px; width: 60px;"
+          class="AnalyticalTable--tbody-"
+          style="height: 220px; width: 100%;"
         >
           <div
-            style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px);"
+            aria-rowindex="0"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 0px; height: 44px; width: 100%;"
           >
             <div
-              class="TableColumnHeader--header-"
-              data-column-id="name"
-              draggable="false"
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
             >
               <span
-                style="text-overflow: ellipsis; overflow-x: hidden; white-space: nowrap;"
-                title="Name"
-              >
-                Name
-              </span>
-              <div
-                class="TableColumnHeader--iconContainer-"
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
               />
             </div>
-          </div>
-          <ui5-popover
-            class=""
-            horizontal-align="Left"
-            no-arrow="true"
-            placement-type="Bottom"
-            style="font-weight: normal;"
-            vertical-align="Center"
-          >
-            <ui5-list
-              class=""
-              footer-text=""
-              header-text=""
-              mode="None"
-              no-data-text=""
-              separators="All"
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
             >
-              <ui5-li
-                class=""
-                data-sort="asc"
-                icon="sort-ascending"
-                info-state="None"
-                type="Active"
-              >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+          <div
+            aria-rowindex="1"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 44px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+          <div
+            aria-rowindex="2"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 88px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+          <div
+            aria-rowindex="3"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 132px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+          <div
+            aria-rowindex="4"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 176px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AnalyticalTable Tree Table 1`] = `
+<div>
+  <div
+    style="min-height: 1.5rem; display: flex; align-items: center;"
+  >
+    <ui5-title
+      class=""
+      level="H2"
+    >
+      Table Title
+    </ui5-title>
+  </div>
+  <div
+    class="AnalyticalTable--tableContainer-"
+  >
+    <div
+      aria-rowcount="5"
+      class="AnalyticalTable--table-"
+      role="table"
+    >
+      <header
+        class="AnalyticalTable--tableHeaderRow-"
+        role="rowgroup"
+        style="position: relative; width: 240px;"
+      >
+        <div
+          class="AnalyticalTable--th-"
+          id="name"
+          role="columnheader"
+          style="position: absolute; top: 0px; left: 0px; width: 60px;"
+        >
+          <div
+            style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden; max-width: calc(100% - 16px);"
+          >
+            <div
+              class="TableColumnHeader--header-"
+              data-column-id="name"
+              draggable="false"
+            >
+              <span
+                style="text-overflow: ellipsis; overflow-x: hidden; white-space: nowrap;"
+                title="Name"
+              >
+                Name
+              </span>
+              <div
+                class="TableColumnHeader--iconContainer-"
+              />
+            </div>
+          </div>
+          <ui5-popover
+            class=""
+            horizontal-align="Left"
+            no-arrow="true"
+            placement-type="Bottom"
+            style="font-weight: normal;"
+            vertical-align="Center"
+          >
+            <ui5-list
+              class=""
+              footer-text=""
+              header-text=""
+              mode="None"
+              no-data-text=""
+              separators="All"
+            >
+              <ui5-li
+                class=""
+                data-sort="asc"
+                icon="sort-ascending"
+                info-state="None"
+                type="Active"
+              >
                 Sort Ascending
               </ui5-li>
               <ui5-li
@@ -2003,58 +2194,115 @@ exports[`AnalyticalTable Tree Table 1`] = `
             </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="2"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 88px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="3"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 132px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="4"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 176px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                style="padding-left: 0px;"
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -2079,7 +2327,7 @@ exports[`AnalyticalTable custom row height 1`] = `
     class="AnalyticalTable--tableContainer- AnalyticalTable--modifiedRowHeight- AnalyticalTable--modifiedRowHeight-d0-"
   >
     <div
-      aria-rowcount="2"
+      aria-rowcount="5"
       class="AnalyticalTable--table-"
       role="table"
     >
@@ -2477,58 +2725,145 @@ exports[`AnalyticalTable custom row height 1`] = `
             </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="2"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 120px; height: 60px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="3"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 180px; height: 60px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="4"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 240px; height: 60px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -2553,7 +2888,7 @@ exports[`AnalyticalTable render without data 1`] = `
     class="AnalyticalTable--tableContainer-"
   >
     <div
-      aria-rowcount="0"
+      aria-rowcount="5"
       class="AnalyticalTable--table-"
       role="table"
     >
@@ -2773,70 +3108,309 @@ exports[`AnalyticalTable render without data 1`] = `
             style="display: inline-block; width: 100%; font-weight: normal; cursor: pointer; height: 100%; overflow-x: hidden;"
           >
             <div
-              class="TableColumnHeader--header-"
-              data-column-id="friend.age"
-              draggable="true"
+              class="TableColumnHeader--header-"
+              data-column-id="friend.age"
+              draggable="true"
+            >
+              <span
+                style="text-overflow: ellipsis; overflow-x: hidden; white-space: nowrap;"
+              >
+                <span>
+                  Friend Age
+                </span>
+              </span>
+              <div
+                class="TableColumnHeader--iconContainer-"
+              />
+            </div>
+          </div>
+          <ui5-popover
+            class=""
+            horizontal-align="Left"
+            no-arrow="true"
+            placement-type="Bottom"
+            style="font-weight: normal;"
+            vertical-align="Center"
+          >
+            <ui5-list
+              class=""
+              footer-text=""
+              header-text=""
+              mode="None"
+              no-data-text=""
+              separators="All"
+            >
+              <ui5-li
+                class=""
+                data-sort="asc"
+                icon="sort-ascending"
+                info-state="None"
+                type="Active"
+              >
+                Sort Ascending
+              </ui5-li>
+              <ui5-li
+                class=""
+                data-sort="desc"
+                icon="sort-descending"
+                info-state="None"
+                type="Active"
+              >
+                Sort Descending
+              </ui5-li>
+            </ui5-list>
+          </ui5-popover>
+          <div
+            class="TableColumnHeader--resizer- TableColumnHeader--lastColumn-"
+            draggable="false"
+            style="cursor: ew-resize;"
+          />
+        </div>
+      </header>
+      <div
+        class="AnalyticalTable--virtualTableBody-"
+        style="position: relative; height: 220px; width: 240px; overflow: auto; will-change: transform; direction: ltr;"
+      >
+        <div
+          class="AnalyticalTable--tbody- AnalyticalTable--alternateRowColor-"
+          style="height: 220px; width: 100%;"
+        >
+          <div
+            aria-rowindex="0"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 0px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+          <div
+            aria-rowindex="1"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 44px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+          <div
+            aria-rowindex="2"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 88px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+          <div
+            aria-rowindex="3"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 132px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
+          <div
+            aria-rowindex="4"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
+            role="row"
+            style="position: absolute; left: 0px; top: 176px; height: 44px; width: 100%;"
+          >
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
             >
               <span
-                style="text-overflow: ellipsis; overflow-x: hidden; white-space: nowrap;"
-              >
-                <span>
-                  Friend Age
-                </span>
-              </span>
-              <div
-                class="TableColumnHeader--iconContainer-"
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
               />
             </div>
-          </div>
-          <ui5-popover
-            class=""
-            horizontal-align="Left"
-            no-arrow="true"
-            placement-type="Bottom"
-            style="font-weight: normal;"
-            vertical-align="Center"
-          >
-            <ui5-list
-              class=""
-              footer-text=""
-              header-text=""
-              mode="None"
-              no-data-text=""
-              separators="All"
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
             >
-              <ui5-li
-                class=""
-                data-sort="asc"
-                icon="sort-ascending"
-                info-state="None"
-                type="Active"
-              >
-                Sort Ascending
-              </ui5-li>
-              <ui5-li
-                class=""
-                data-sort="desc"
-                icon="sort-descending"
-                info-state="None"
-                type="Active"
-              >
-                Sort Descending
-              </ui5-li>
-            </ui5-list>
-          </ui5-popover>
-          <div
-            class="TableColumnHeader--resizer- TableColumnHeader--lastColumn-"
-            draggable="false"
-            style="cursor: ew-resize;"
-          />
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+            <div
+              class="AnalyticalTable--tableCell-"
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
+          </div>
         </div>
-      </header>
-      <div
-        class="AnalyticalTable--noDataContainer-"
-        style="height: 220px;"
-      >
-        No Data
       </div>
     </div>
   </div>
@@ -2859,7 +3433,7 @@ exports[`AnalyticalTable test Asc desc 1`] = `
     class="AnalyticalTable--tableContainer-"
   >
     <div
-      aria-rowcount="2"
+      aria-rowcount="5"
       class="AnalyticalTable--table-"
       role="table"
     >
@@ -3257,58 +3831,145 @@ exports[`AnalyticalTable test Asc desc 1`] = `
             </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="2"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 88px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="3"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 132px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="4"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 176px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -3333,7 +3994,7 @@ exports[`AnalyticalTable test drag and drop of a draggable column 1`] = `
     class="AnalyticalTable--tableContainer-"
   >
     <div
-      aria-rowcount="2"
+      aria-rowcount="5"
       class="AnalyticalTable--table-"
       role="table"
     >
@@ -3731,58 +4392,145 @@ exports[`AnalyticalTable test drag and drop of a draggable column 1`] = `
             </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="2"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 88px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="3"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 132px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
           <div
-            class="AnalyticalTable--tr-"
+            aria-rowindex="4"
+            class="AnalyticalTable--tr- AnalyticalTable--emptyRow-"
             role="row"
             style="position: absolute; left: 0px; top: 176px; height: 44px; width: 100%;"
           >
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 0px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 60px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 120px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
             <div
               class="AnalyticalTable--tableCell-"
-            />
+              style="position: absolute; top: 0px; left: 180px; width: 60px; align-items: center;"
+            >
+              <span
+                class="Text--text- Text--noWrap-"
+                style="width: 100%;"
+                title=""
+              />
+            </div>
           </div>
         </div>
       </div>
diff --git a/packages/main/src/components/AnalyticalTable/hooks/useTableRowStyling.ts b/packages/main/src/components/AnalyticalTable/hooks/useTableRowStyling.ts
index 850cf90c6db..2eedf58a363 100644
--- a/packages/main/src/components/AnalyticalTable/hooks/useTableRowStyling.ts
+++ b/packages/main/src/components/AnalyticalTable/hooks/useTableRowStyling.ts
@@ -6,17 +6,22 @@ const ROW_SELECTION_ATTRIBUTE = 'data-is-selected';
 export const useTableRowStyling = (hooks) => {
   hooks.getRowProps.push((passedRowProps, { instance, row }) => {
     const { classes, selectionMode, onRowSelected } = instance.webComponentsReactProperties;
+    const isEmptyRow = row.original?.emptyRow;
     let className = classes.tr;
     if (row.isGrouped) {
       className += ` ${classes.tableGroupHeader}`;
     }
 
+    if(isEmptyRow) {
+      className += ` ${classes.emptyRow}`;
+    }
+
     const rowProps: any = {
       ...passedRowProps,
       className,
       role: 'row'
     };
-    if ([TableSelectionMode.SINGLE_SELECT, TableSelectionMode.MULTI_SELECT].includes(selectionMode)) {
+    if ([TableSelectionMode.SINGLE_SELECT, TableSelectionMode.MULTI_SELECT].includes(selectionMode) && !isEmptyRow) {
       rowProps.onClick = (e) => {
         if (row.isGrouped) {
           return;
diff --git a/packages/main/src/components/AnalyticalTable/index.tsx b/packages/main/src/components/AnalyticalTable/index.tsx
index e87c536a938..b2a806851f2 100644
--- a/packages/main/src/components/AnalyticalTable/index.tsx
+++ b/packages/main/src/components/AnalyticalTable/index.tsx
@@ -133,7 +133,6 @@ const useStyles = createUseStyles<JSSTheme, keyof ReturnType<typeof styles>>(sty
 const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<HTMLDivElement>) => {
   const {
     columns,
-    data,
     className,
     style,
     tooltip,
@@ -180,6 +179,17 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
     return DefaultColumn;
   }, [columnWidth]);
 
+  const data = useMemo(() => {
+    if (minRows > props.data.length) {
+      const missingRows = minRows - props.data.length;
+      // @ts-ignore
+      const emptyRows = [...Array(missingRows).keys()].map(() => ({ emptyRow: true }));
+
+      return [...props.data, ...emptyRows];
+    }
+    return props.data;
+  }, [props.data, minRows]);
+
   const {
     getTableProps,
     headerGroups,
@@ -293,8 +303,9 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
   const internalRowHeight = rowHeight ?? calcRowHeight;
 
   const tableBodyHeight = useMemo(() => {
-    return internalRowHeight * Math.max(rows.length < visibleRows ? rows.length : visibleRows, minRows);
-  }, [internalRowHeight, rows.length, minRows, visibleRows]);
+    const rowNum = rows.length < visibleRows ? Math.max(rows.length, minRows) : visibleRows;
+    return internalRowHeight * rowNum;
+  }, [internalRowHeight, rows.length, visibleRows, minRows]);
 
   const noDataStyles = useMemo(() => {
     return {
diff --git a/packages/main/src/components/AnalyticalTable/virtualization/VirtualTableRow.tsx b/packages/main/src/components/AnalyticalTable/virtualization/VirtualTableRow.tsx
index 5f7e42a6d7f..7c194e673d5 100644
--- a/packages/main/src/components/AnalyticalTable/virtualization/VirtualTableRow.tsx
+++ b/packages/main/src/components/AnalyticalTable/virtualization/VirtualTableRow.tsx
@@ -3,21 +3,11 @@ import React from 'react';
 export const VirtualTableRow = (props) => {
   const { style, index, data } = props;
   const { additionalProps, rows } = data;
-  const { isTreeTable, classes, columns } = additionalProps;
+  const { isTreeTable } = additionalProps;
   const row = rows[index];
 
   if (!row) {
-    return (
-      <div key={`minRow-${index}`} className={classes.tr} style={style} role="row">
-        {columns.map((col, colIndex) => {
-          let classNames = classes.tableCell;
-          if (col.className) {
-            classNames += ` ${col.className}`;
-          }
-          return <div className={classNames} key={`minRow-${index}-${colIndex}`} />;
-        })}
-      </div>
-    );
+    return null;
   }
 
   return (