diff --git a/package.json b/package.json
index d030aea1..d373d307 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netdata/netdata-ui",
-  "version": "5.4.10",
+  "version": "5.4.11",
   "description": "netdata UI kit",
   "main": "dist/index.js",
   "module": "dist/es6/index.js",
diff --git a/src/components/table/body/index.js b/src/components/table/body/index.js
index 2586c25f..a5737b5e 100644
--- a/src/components/table/body/index.js
+++ b/src/components/table/body/index.js
@@ -5,6 +5,7 @@ import Flex from "@/components/templates/flex"
 import { useTableState } from "../provider"
 import Row from "./row"
 import Header from "./header"
+import RowPlaceholdersRenderer from "./rowPLaceholdersRenderer"
 
 const noop = () => {}
 
@@ -35,7 +36,8 @@ const Body = memo(
     initialOffset = 0,
     onScroll,
     enableColumnReordering,
-    renderPlaceholder,
+    RowPlaceholder,
+    placeholdersLength,
     ...rest
   }) => {
     useTableState(rerenderSelector)
@@ -73,25 +75,30 @@ const Body = memo(
     const lastVirtualDataIndex = virtualRows[virtualRows.length - 1]?.index ?? 0
 
     const placeholders = useMemo(() => {
-      if (!renderPlaceholder) return { before: [], after: [] }
+      if (!RowPlaceholder) return { before: [], after: [] }
 
-      const N = overscan || 15
       const firstDataIndex = 1
       const lastDataIndex = rows.length
 
-      // "before" = up to N data rows immediately before the virtual window (outside overscan)
+      // "before" = rows before the virtual window; capped to placeholdersLength when provided
       const beforeEnd = firstVirtualDataIndex
-      const beforeStart = Math.max(firstDataIndex, beforeEnd - N)
+      const beforeStart =
+        placeholdersLength != null
+          ? Math.max(firstDataIndex, beforeEnd - placeholdersLength)
+          : firstDataIndex
 
-      // "after" = up to N data rows immediately after the virtual window (outside overscan)
+      // "after" = rows after the virtual window; capped to placeholdersLength when provided
       const afterStart = lastVirtualDataIndex + 1
-      const afterEnd = Math.min(lastDataIndex + 1, afterStart + N)
+      const afterEnd =
+        placeholdersLength != null
+          ? Math.min(lastDataIndex + 1, afterStart + placeholdersLength)
+          : lastDataIndex + 1
 
       return {
         before: Array.from({ length: beforeEnd - beforeStart }, (_, i) => beforeStart + i),
         after: Array.from({ length: afterEnd - afterStart }, (_, i) => afterStart + i),
       }
-    }, [renderPlaceholder, firstVirtualDataIndex, lastVirtualDataIndex, rows.length, overscan])
+    }, [RowPlaceholder, firstVirtualDataIndex, lastVirtualDataIndex, rows.length, placeholdersLength])
 
     const getPlaceholderOffset = useCallback(
       index => {
@@ -145,25 +152,11 @@ const Body = memo(
             flex: "1 0 auto",
           }}
         >
-          {renderPlaceholder &&
-            placeholders.before.map(index => (
-              <div
-                key={`placeholder-before-${index}`}
-                style={{
-                  position: "absolute",
-                  top: 0,
-                  left: 0,
-                  transform: `translateY(${getPlaceholderOffset(index)}px)`,
-                  minWidth: "100%",
-                }}
-              >
-                {renderPlaceholder({
-                  index: index - 1,
-                  isBefore: true,
-                  table,
-                })}
-              </div>
-            ))}
+          <RowPlaceholdersRenderer
+            RowPlaceholder={RowPlaceholder}
+            items={placeholders.before}
+            getPlaceholderOffset={getPlaceholderOffset}
+          />
           {virtualRows.map(virtualRow => {
             return (
               <div
@@ -208,25 +201,11 @@ const Body = memo(
               </div>
             )
           })}
-          {renderPlaceholder &&
-            placeholders.after.map(index => (
-              <div
-                key={`placeholder-after-${index}`}
-                style={{
-                  position: "absolute",
-                  top: 0,
-                  left: 0,
-                  transform: `translateY(${getPlaceholderOffset(index)}px)`,
-                  minWidth: "100%",
-                }}
-              >
-                {renderPlaceholder({
-                  index: index - 1,
-                  isBefore: false,
-                  table,
-                })}
-              </div>
-            ))}
+          <RowPlaceholdersRenderer
+            RowPlaceholder={RowPlaceholder}
+            items={placeholders.after}
+            getPlaceholderOffset={getPlaceholderOffset}
+          />
         </div>
       </Flex>
     )
diff --git a/src/components/table/body/rowPLaceholdersRenderer.js b/src/components/table/body/rowPLaceholdersRenderer.js
new file mode 100644
index 00000000..7d814d94
--- /dev/null
+++ b/src/components/table/body/rowPLaceholdersRenderer.js
@@ -0,0 +1,33 @@
+import React, { isValidElement } from "react"
+
+const RowPlaceholdersRenderer = ({
+  RowPlaceholder,
+  items = [],
+  getPlaceholderOffset,
+  ...props
+}) => {
+  if (!items.length) return null
+
+  return (
+    <>
+      {items.map(index => (
+        <div
+          key={`placeholder-${index}`}
+          style={{
+            position: "absolute",
+            top: 0,
+            left: 0,
+            minWidth: "100%",
+            ...(typeof getPlaceholderOffset === "function"
+              ? { transform: `translateY(${getPlaceholderOffset(index)}px)` }
+              : {}),
+          }}
+        >
+          {RowPlaceholder ? <RowPlaceholder index={index - 1} /> : null}
+        </div>
+      ))}
+    </>
+  )
+}
+
+export default RowPlaceholdersRenderer