diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx
index c6116f53f..acb541131 100644
--- a/frontend/src/main.jsx
+++ b/frontend/src/main.jsx
@@ -6,8 +6,8 @@ import theme from '@/themes'
 import './i18n'
 import { KeycloakProvider } from '@/components/KeycloakProvider'
 import { getKeycloak } from '@/utils/keycloak'
-import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'
 import { LocalizationProvider } from '@mui/x-date-pickers'
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3'
 
 const queryClient = new QueryClient()
 const keycloak = getKeycloak()
@@ -19,7 +19,7 @@ if (root) {
       <KeycloakProvider authClient={keycloak}>
         <QueryClientProvider client={queryClient}>
           <ThemeProvider theme={theme}>
-            <LocalizationProvider dateAdapter={AdapterDayjs}>
+            <LocalizationProvider dateAdapter={AdapterDateFns}>
               <CssBaseline />
               <App />
             </LocalizationProvider>
diff --git a/frontend/src/views/FuelCodes/_schema.jsx b/frontend/src/views/FuelCodes/_schema.jsx
index 34c0b6e1b..db7fc62d5 100644
--- a/frontend/src/views/FuelCodes/_schema.jsx
+++ b/frontend/src/views/FuelCodes/_schema.jsx
@@ -76,45 +76,25 @@ export const fuelCodeColDefs = (t) => [
   {
     field: 'applicationDate',
     headerName: t('fuelCode:fuelCodeColLabels.applicationDate'),
-    filter: 'agDateColumnFilter',
-    filterParams: {
-      filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
-      suppressAndOrCondition: true,
-      maxValidYear: 2400
-    },
+    filter: false,
     cellRenderer: TextRenderer
   },
   {
     field: 'approvalDate',
     headerName: t('fuelCode:fuelCodeColLabels.approvalDate'),
-    filter: 'agDateColumnFilter',
-    filterParams: {
-      filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
-      suppressAndOrCondition: true,
-      maxValidYear: 2400
-    },
+    filter: false,
     cellRenderer: TextRenderer
   },
   {
     field: 'effectiveDate',
     headerName: t('fuelCode:fuelCodeColLabels.effectiveDate'),
-    filter: 'agDateColumnFilter',
-    filterParams: {
-      filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
-      suppressAndOrCondition: true,
-      maxValidYear: 2400
-    },
+    filter: false,
     cellRenderer: TextRenderer
   },
   {
     field: 'expirationDate',
     headerName: t('fuelCode:fuelCodeColLabels.expirationDate'),
-    filter: 'agDateColumnFilter',
-    filterParams: {
-      filterOptions: ['equals', 'lessThan', 'greaterThan', 'inRange'],
-      suppressAndOrCondition: true,
-      maxValidYear: 2400
-    },
+    filter: false,
     cellRenderer: TextRenderer
   },
   {