diff --git a/packages/toolpad-studio/package.json b/packages/toolpad-studio/package.json
index 6a83b6eb6cc..1dd57b121cc 100644
--- a/packages/toolpad-studio/package.json
+++ b/packages/toolpad-studio/package.json
@@ -66,8 +66,6 @@
     "@mui/icons-material": "6.1.3",
     "@mui/lab": "6.0.0-beta.11",
     "@mui/material": "6.1.3",
-    "@mui/system": "6.1.3",
-    "@mui/types": "7.2.18",
     "@mui/utils": "6.1.3",
     "@mui/x-charts": "7.20.0",
     "@mui/x-data-grid": "7.20.0",
diff --git a/packages/toolpad-studio/src/ThemeContext.tsx b/packages/toolpad-studio/src/ThemeContext.tsx
index 10fd011abef..0435e6ec641 100644
--- a/packages/toolpad-studio/src/ThemeContext.tsx
+++ b/packages/toolpad-studio/src/ThemeContext.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { PaletteMode, ScopedCssBaseline } from '@mui/material';
 import { ThemeProvider as MuiThemeProvider, createTheme } from '@mui/material/styles';
-import { deepmerge } from '@mui/utils';
+import deepmerge from '@mui/utils/deepmerge';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { getDesignTokens, getMetaThemeColor, getThemedComponents } from './theme';
 import useLocalStorageState from './utils/useLocalStorageState';
diff --git a/packages/toolpad-studio/src/runtime/AppThemeProvider.tsx b/packages/toolpad-studio/src/runtime/AppThemeProvider.tsx
index 7b9b8aacd00..3d06255e54c 100644
--- a/packages/toolpad-studio/src/runtime/AppThemeProvider.tsx
+++ b/packages/toolpad-studio/src/runtime/AppThemeProvider.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { createTheme, Theme, ThemeProvider, ThemeOptions } from '@mui/material';
-import { deepmerge } from '@mui/utils';
+import deepmerge from '@mui/utils/deepmerge';
 import * as appDom from '@toolpad/studio-runtime/appDom';
 
 declare module '@mui/material/styles' {
diff --git a/packages/toolpad-studio/src/runtime/api.ts b/packages/toolpad-studio/src/runtime/api.ts
index 651cee277c4..7054845ac10 100644
--- a/packages/toolpad-studio/src/runtime/api.ts
+++ b/packages/toolpad-studio/src/runtime/api.ts
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { queryClient } from '@toolpad/studio-runtime';
-// TODO: move this rpc logic to @mui/utils
+// TODO: move this rpc logic to @toolpad/utils
 // eslint-disable-next-line import/no-restricted-paths
 import { ApiClient, createRpcApi } from '../rpcClient';
 
diff --git a/packages/toolpad-studio/src/toolpad/AppEditor/PageEditor/ComponentEditor.tsx b/packages/toolpad-studio/src/toolpad/AppEditor/PageEditor/ComponentEditor.tsx
index 0a37692ac97..ecc4c23fb72 100644
--- a/packages/toolpad-studio/src/toolpad/AppEditor/PageEditor/ComponentEditor.tsx
+++ b/packages/toolpad-studio/src/toolpad/AppEditor/PageEditor/ComponentEditor.tsx
@@ -11,7 +11,7 @@ import {
 } from '@toolpad/studio-runtime';
 import { ExactEntriesOf } from '@toolpad/utils/types';
 import * as appDom from '@toolpad/studio-runtime/appDom';
-import Box from '@mui/system/Box';
+import Box from '@mui/material/Box';
 import NodeAttributeEditor from './NodeAttributeEditor';
 import { usePageEditorState } from './PageEditorProvider';
 import { useToolpadComponent } from '../toolpadComponents';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f53dccbec81..03d4823fad2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -195,7 +195,7 @@ importers:
         version: 7.37.1(eslint@8.57.1)
       eslint-plugin-react-compiler:
         specifier: latest
-        version: 0.0.0-experimental-45ae4c3-20241011(eslint@8.57.1)
+        version: 0.0.0-experimental-fa06e2c-20241014(eslint@8.57.1)
       eslint-plugin-react-hooks:
         specifier: 4.6.2
         version: 4.6.2(eslint@8.57.1)
@@ -711,12 +711,6 @@ importers:
       '@mui/material':
         specifier: 6.1.3
         version: 6.1.3(@emotion/react@11.13.3(@types/react@18.3.11)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.11)(react@18.3.1))(@types/react@18.3.11)(react@18.3.1))(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@mui/system':
-        specifier: 6.1.3
-        version: 6.1.3(@emotion/react@11.13.3(@types/react@18.3.11)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.11)(react@18.3.1))(@types/react@18.3.11)(react@18.3.1))(@types/react@18.3.11)(react@18.3.1)
-      '@mui/types':
-        specifier: 7.2.18
-        version: 7.2.18(@types/react@18.3.11)
       '@mui/utils':
         specifier: 6.1.3
         version: 6.1.3(@types/react@18.3.11)(react@18.3.1)
@@ -5991,8 +5985,8 @@ packages:
     peerDependencies:
       eslint: '>=7.0.0'
 
-  eslint-plugin-react-compiler@0.0.0-experimental-45ae4c3-20241011:
-    resolution: {integrity: sha512-m+BmeFtVWzrHt87sb5g5jLttHdo9YScPiuiingdEqLYtUv7pdVi6pQgY3nCOI4h09C4wmWS9xzpaVNEgiODOBg==}
+  eslint-plugin-react-compiler@0.0.0-experimental-fa06e2c-20241014:
+    resolution: {integrity: sha512-tHntZz8Kx/6RgCLn7aDGfBQizqTUUfHEDaBcrvJi1GhKzgDxmAbdn85Y6z8eGSh4s0gufNWyO9WRCYLf0hP0ow==}
     engines: {node: ^14.17.0 || ^16.0.0 || >= 18.0.0}
     peerDependencies:
       eslint: '>=7'
@@ -15780,7 +15774,7 @@ snapshots:
       globals: 13.24.0
       rambda: 7.5.0
 
-  eslint-plugin-react-compiler@0.0.0-experimental-45ae4c3-20241011(eslint@8.57.1):
+  eslint-plugin-react-compiler@0.0.0-experimental-fa06e2c-20241014(eslint@8.57.1):
     dependencies:
       '@babel/core': 7.25.8
       '@babel/parser': 7.25.8