diff --git a/.changeset/long-corners-repair.md b/.changeset/long-corners-repair.md
new file mode 100644
index 00000000..5e35f9e4
--- /dev/null
+++ b/.changeset/long-corners-repair.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/pacer-devtools': patch
+---
+
+Moves devtools theme to the component to avoid theme miss-match.
diff --git a/packages/pacer-devtools/src/components/index.tsx b/packages/pacer-devtools/src/components/index.tsx
new file mode 100644
index 00000000..6f0b4baf
--- /dev/null
+++ b/packages/pacer-devtools/src/components/index.tsx
@@ -0,0 +1,16 @@
+import { PacerContextProvider } from '../PacerContextProvider'
+import { Shell } from './Shell'
+
+import { ThemeContextProvider } from '@tanstack/devtools-ui'
+
+import type { DevtoolProps } from '@tanstack/devtools-utils/solid'
+
+export default function PacerDevtools(props: DevtoolProps) {
+  return (
+    <ThemeContextProvider theme={props.theme}>
+      <PacerContextProvider>
+        <Shell />
+      </PacerContextProvider>
+    </ThemeContextProvider>
+  )
+}
diff --git a/packages/pacer-devtools/src/core.tsx b/packages/pacer-devtools/src/core.tsx
index cf67bbdf..ea380393 100644
--- a/packages/pacer-devtools/src/core.tsx
+++ b/packages/pacer-devtools/src/core.tsx
@@ -3,7 +3,7 @@ import { constructCoreClass } from '@tanstack/devtools-utils/solid'
 export interface PacerDevtoolsInit {}
 
 const [PacerDevtoolsCore, PacerDevtoolsCoreNoOp] = constructCoreClass(
-  () => import('./PacerDevtools'),
+  () => import('./components'),
 )
 
 export { PacerDevtoolsCore, PacerDevtoolsCoreNoOp }