diff --git a/examples/lit/virtualized-rows/package.json b/examples/lit/virtualized-rows/package.json
index 59541ed453..2d2d7aca77 100644
--- a/examples/lit/virtualized-rows/package.json
+++ b/examples/lit/virtualized-rows/package.json
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "@faker-js/faker": "^8.4.1",
-    "@lit-labs/virtualizer": "^2.0.13",
     "@tanstack/lit-table": "^8.19.2",
+    "@tanstack/lit-virtual": "^3.8.3",
     "lit": "^3.1.4"
   },
   "devDependencies": {
diff --git a/examples/lit/virtualized-rows/src/main.ts b/examples/lit/virtualized-rows/src/main.ts
index a33c18b877..d11e3fd0dd 100644
--- a/examples/lit/virtualized-rows/src/main.ts
+++ b/examples/lit/virtualized-rows/src/main.ts
@@ -6,12 +6,14 @@ import {
   flexRender,
   getCoreRowModel,
   getSortedRowModel,
+  Row,
   TableController,
 } from '@tanstack/lit-table'
-import config from '../twind.config'
 import { styleMap } from 'lit/directives/style-map.js'
-import { virtualize, virtualizerRef } from '@lit-labs/virtualizer/virtualize.js'
+
 import { makeData, Person } from './makeData.ts'
+import { VirtualizerController } from '@tanstack/lit-virtual'
+import { createRef, ref, Ref } from 'lit/directives/ref.js'
 
 const columns: ColumnDef<Person>[] = [
   {
@@ -61,6 +63,20 @@ const data = makeData(50_000)
 class LitTableExample extends LitElement {
   private tableController = new TableController<Person>(this)
 
+  private tableContainerRef: Ref = createRef()
+
+  private rowVirtualizerController: VirtualizerController<Element, Element>
+
+  connectedCallback() {
+    this.rowVirtualizerController = new VirtualizerController(this, {
+      count: data.length,
+      getScrollElement: () => this.tableContainerRef.value!,
+      estimateSize: () => 33,
+      overscan: 5,
+    })
+    super.connectedCallback()
+  }
+
   protected render(): unknown {
     const table = this.tableController.table({
       columns,
@@ -69,11 +85,14 @@ class LitTableExample extends LitElement {
       getCoreRowModel: getCoreRowModel(),
     })
     const { rows } = table.getRowModel()
+
+    const virtualizer = this.rowVirtualizerController.getVirtualizer()
     return html`
       <div class="app">
         (${data.length} rows)
         <div
           class="container"
+          ${ref(this.tableContainerRef)}
           style="${styleMap({
             overflow: 'auto', //our scrollable table container
             position: 'relative', //needed for sticky header
@@ -122,21 +141,30 @@ class LitTableExample extends LitElement {
             <tbody
               style=${styleMap({
                 display: 'grid',
-                height: 500,
-                // height: `${rowVirtualizer.getTotalSize()}px`, //tells scrollbar how big the table is
+                height: `${virtualizer.getTotalSize()}px`, //tells scrollbar how big the table is
                 position: 'relative', //needed for absolute positioning of rows
               })}
             >
-              ${virtualize({
-                items: data,
-                renderItem: (_, index) => {
-                  const row = rows[index]
+              ${repeat(
+                this.rowVirtualizerController
+                  .getVirtualizer()
+                  .getVirtualItems(),
+                item => item.key,
+                item => {
+                  const row = rows[item.index] as Row<Person>
                   return html`
                     <tr
                       style=${styleMap({
                         display: 'flex',
+                        position: 'absolute',
+                        transform: `translateY(${item.start}px)`,
                         width: '100%',
                       })}
+                      ${ref(node =>
+                        this.rowVirtualizerController
+                          .getVirtualizer()
+                          .measureElement(node)
+                      )}
                     >
                       ${repeat(
                         row.getVisibleCells(),
@@ -157,8 +185,8 @@ class LitTableExample extends LitElement {
                       )}
                     </tr>
                   `
-                },
-              })}
+                }
+              )}
             </tbody>
           </table>
         </div>
diff --git a/examples/lit/virtualized-rows/tsconfig.json b/examples/lit/virtualized-rows/tsconfig.json
index 3141563c8a..f90811f312 100644
--- a/examples/lit/virtualized-rows/tsconfig.json
+++ b/examples/lit/virtualized-rows/tsconfig.json
@@ -15,6 +15,7 @@
     "jsx": "react-jsx",
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
+    "strictPropertyInitialization": false,
 
     /* Linting */
     "strict": true,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b0a11a17ee..0f06c2f96a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -947,12 +947,12 @@ importers:
       '@faker-js/faker':
         specifier: ^8.4.1
         version: 8.4.1
-      '@lit-labs/virtualizer':
-        specifier: ^2.0.13
-        version: 2.0.13
       '@tanstack/lit-table':
         specifier: ^8.19.2
         version: link:../../../packages/lit-table
+      '@tanstack/lit-virtual':
+        specifier: ^3.8.3
+        version: 3.8.3(lit@3.1.4)
       lit:
         specifier: ^3.1.4
         version: 3.1.4
@@ -4618,9 +4618,6 @@ packages:
   '@lit-labs/ssr-dom-shim@1.2.0':
     resolution: {integrity: sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==}
 
-  '@lit-labs/virtualizer@2.0.13':
-    resolution: {integrity: sha512-OKojbIFohfrRpWd3OxcVSc2nyTd0jx10ZSQobuOW9H9jYkad02OJ1uFvV/sHJey8hoh95FIO4d43h+Ry/G4nGw==}
-
   '@lit/reactive-element@2.0.4':
     resolution: {integrity: sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==}
 
@@ -5167,6 +5164,11 @@ packages:
     resolution: {integrity: sha512-euTyZoHidW1+NeAW9V7SSPNjD6c54TBqKBO8HypA880HWlTXLW6V8rcBnfi1LY1W706dGCvDmZDTg6fsl/jJUw==}
     engines: {node: '>=12'}
 
+  '@tanstack/lit-virtual@3.8.3':
+    resolution: {integrity: sha512-SONYxXVjK8G0ZL3XF1Byc/U0c3ZNKyzYzSr2y4IW58X55K7OrQrLvAjJb/p1ZVLcX1T6GVMoFA3zeFss1fRwXg==}
+    peerDependencies:
+      lit: ^3.1.0
+
   '@tanstack/query-core@5.49.0':
     resolution: {integrity: sha512-xUTjCPHC8G+ZvIUzjoMOLnMpNXYPQI4HjhlizTVVBwtSp24iWo4/kaBzHAzsrCVyfbiaPIFFkUvicsY4r8kF8A==}
 
@@ -5220,6 +5222,9 @@ packages:
   '@tanstack/virtual-core@3.8.1':
     resolution: {integrity: sha512-uNtAwenT276M9QYCjTBoHZ8X3MUeCRoGK59zPi92hMIxdfS9AyHjkDWJ94WroDxnv48UE+hIeo21BU84jKc8aQ==}
 
+  '@tanstack/virtual-core@3.8.3':
+    resolution: {integrity: sha512-vd2A2TnM5lbnWZnHi9B+L2gPtkSeOtJOAw358JqokIH1+v2J7vUAzFVPwB/wrye12RFOurffXu33plm4uQ+JBQ==}
+
   '@testing-library/dom@10.2.0':
     resolution: {integrity: sha512-CytIvb6tVOADRngTHGWNxH8LPgO/3hi/BdCEHOf7Qd2GvZVClhVP0Wo/QHzWhpki49Bk0b4VT6xpt3fx8HTSIw==}
     engines: {node: '>=18'}
@@ -12418,11 +12423,6 @@ snapshots:
 
   '@lit-labs/ssr-dom-shim@1.2.0': {}
 
-  '@lit-labs/virtualizer@2.0.13':
-    dependencies:
-      lit: 3.1.4
-      tslib: 2.6.3
-
   '@lit/reactive-element@2.0.4':
     dependencies:
       '@lit-labs/ssr-dom-shim': 1.2.0
@@ -13008,6 +13008,11 @@ snapshots:
 
   '@tanstack/history@1.41.0': {}
 
+  '@tanstack/lit-virtual@3.8.3(lit@3.1.4)':
+    dependencies:
+      '@tanstack/virtual-core': 3.8.3
+      lit: 3.1.4
+
   '@tanstack/query-core@5.49.0': {}
 
   '@tanstack/react-query@5.49.0(react@18.3.1)':
@@ -13077,6 +13082,8 @@ snapshots:
 
   '@tanstack/virtual-core@3.8.1': {}
 
+  '@tanstack/virtual-core@3.8.3': {}
+
   '@testing-library/dom@10.2.0':
     dependencies:
       '@babel/code-frame': 7.24.7