diff --git a/src/components/molecules/CurriculumItem/CurriculumItem.tsx b/src/components/molecules/CurriculumItem/CurriculumItem.tsx
index 084eddd..2192e1f 100644
--- a/src/components/molecules/CurriculumItem/CurriculumItem.tsx
+++ b/src/components/molecules/CurriculumItem/CurriculumItem.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Accordion, AccordionDetails, AccordionSummary, Box, Grid2 as Grid, Typography } from '@mui/material'
+import { Accordion, AccordionDetails, AccordionSummary, Box, Grid, Typography } from '@mui/material'
 import { ExpandMore as ExpandIcon } from '@mui/icons-material'
 
 interface CurriculumEntryProps {
diff --git a/src/components/molecules/ProjectSpotlight/ProjectSpotlight.tsx b/src/components/molecules/ProjectSpotlight/ProjectSpotlight.tsx
index 2c4a52f..89c69f7 100644
--- a/src/components/molecules/ProjectSpotlight/ProjectSpotlight.tsx
+++ b/src/components/molecules/ProjectSpotlight/ProjectSpotlight.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { ParallaxBanner, ParallaxProvider } from 'react-scroll-parallax'
-import { Box, Grid2 as Grid, IconButton, Typography, useTheme } from '@mui/material'
+import { Box, Grid, IconButton, Typography, useTheme } from '@mui/material'
 import { ExpandMore } from '@mui/icons-material'
 
 import { useViewport } from 'components/utils/viewport/index.js'
diff --git a/vite.config.ts b/vite.config.ts
index 829c656..fc21365 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -6,6 +6,7 @@ import viteTsconfigPaths from 'vite-tsconfig-paths'
 export default defineConfig({
   plugins: [react(), viteTsconfigPaths()],
   resolve: {
+    conditions: ['mui-modern', 'module'],
     alias: {
       components: '/src/components',
       style: '/src/style',
diff --git a/vitest.config.ts b/vitest.config.ts
index 0863162..1472968 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   resolve: {
+    conditions: ['mui-modern', 'module'],
     alias: {
       components: '/src/components',
       style: '/src/style',