diff --git a/src/base/Grid2/Grid2.tsx b/src/base/Grid2/Grid2.tsx
index 245c62e74..5944594ef 100644
--- a/src/base/Grid2/Grid2.tsx
+++ b/src/base/Grid2/Grid2.tsx
@@ -1,6 +1,8 @@
-import MuiGrid, { Grid2Props as MuiGridProps } from '@mui/material/Grid2';
+import { Grid2 as MuiGrid } from '@mui/material';
 import React from 'react';
 
+type MuiGridProps = React.ComponentProps<typeof MuiGrid>;
+
 const Grid2 = React.forwardRef<HTMLDivElement, MuiGridProps>((props, ref) => {
   return <MuiGrid {...props} ref={ref} />;
 });
diff --git a/src/custom/DashboardWidgets/GettingStartedWidget/GetStartedModal.tsx b/src/custom/DashboardWidgets/GettingStartedWidget/GetStartedModal.tsx
index eead2cef1..6c088aee9 100644
--- a/src/custom/DashboardWidgets/GettingStartedWidget/GetStartedModal.tsx
+++ b/src/custom/DashboardWidgets/GettingStartedWidget/GetStartedModal.tsx
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import Grid2 from '@mui/material/Grid2';
-import { SwipeableDrawer } from '@mui/material';
+import { Grid2, SwipeableDrawer } from '@mui/material';
 import { useState } from 'react';
 import {
   Backdrop,
diff --git a/src/custom/InputSearchField/InputSearchField.tsx b/src/custom/InputSearchField/InputSearchField.tsx
index 1a63ae3a3..4524f9d3d 100644
--- a/src/custom/InputSearchField/InputSearchField.tsx
+++ b/src/custom/InputSearchField/InputSearchField.tsx
@@ -1,5 +1,4 @@
-import Grid2 from '@mui/material/Grid2';
-import { Autocomplete } from '@mui/material';
+import { Autocomplete, Grid2 } from '@mui/material';
 import React, { useCallback, useEffect, useState } from 'react';
 import { Box, Chip, CircularProgress, TextField, Tooltip, Typography } from '../../base';
 
diff --git a/src/custom/ResourceDetailFormatters/styles.ts b/src/custom/ResourceDetailFormatters/styles.ts
index 97ae04f36..a6c998f10 100644
--- a/src/custom/ResourceDetailFormatters/styles.ts
+++ b/src/custom/ResourceDetailFormatters/styles.ts
@@ -1,5 +1,4 @@
-import Grid2 from '@mui/material/Grid2';
-import { alpha } from '@mui/material';
+import { alpha, Grid2 } from '@mui/material';
 import { Box, Chip, IconButton, Typography } from '../../base';
 
 import { charcoal, KEPPEL, styled } from '../../theme';
diff --git a/src/custom/TeamTable/TeamTable.tsx b/src/custom/TeamTable/TeamTable.tsx
index 915b54e6d..28d02de94 100644
--- a/src/custom/TeamTable/TeamTable.tsx
+++ b/src/custom/TeamTable/TeamTable.tsx
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import Grid2 from '@mui/material/Grid2';
-import { TableCell } from '@mui/material';
+import { Grid2, TableCell } from '@mui/material';
 import { MUIDataTableColumn } from '@sistent/mui-datatables';
 import { styled, useTheme } from '../../theme';
 import { ErrorBoundary } from '../ErrorBoundary/ErrorBoundary.js';
diff --git a/src/custom/TransferModal/TransferList/style.tsx b/src/custom/TransferModal/TransferList/style.tsx
index 40135265a..550fa4398 100644
--- a/src/custom/TransferModal/TransferList/style.tsx
+++ b/src/custom/TransferModal/TransferList/style.tsx
@@ -1,5 +1,4 @@
-import Grid2 from '@mui/material/Grid2';
-import { styled } from '@mui/material';
+import { Grid2, styled } from '@mui/material';
 import { Button, Chip, Paper, Typography } from '../../../base';
 
 export const StyledChip = styled(Chip)(({ theme }) => ({
diff --git a/src/custom/Workspaces/WorkspaceCard.tsx b/src/custom/Workspaces/WorkspaceCard.tsx
index 1ebc37d63..db4ad11a9 100644
--- a/src/custom/Workspaces/WorkspaceCard.tsx
+++ b/src/custom/Workspaces/WorkspaceCard.tsx
@@ -1,5 +1,4 @@
-import Grid2 from '@mui/material/Grid2';
-import { useTheme } from '@mui/material';
+import { Grid2, useTheme } from '@mui/material';
 import { Backdrop, CircularProgress } from '../../base';
 
 import { getRelativeTime } from '../../utils';