diff --git a/.eslintrc.js b/.eslintrc.js
index b1599cbd2f8c..3d39037cb82d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -28,7 +28,6 @@ module.exports = {
     'packages/codemods/**/__testfixtures__/**/*',
     'packages/core/config/storybook/**/*',
     'packages/create-redwood-app/template/web/src/Routes.tsx',
-    'packages/web/src/entry/index.js', // TODO see why this is needed for React 18 ( "Parsing error: Unexpected token, expected "," (13:38)eslint")
   ],
   rules: {
     '@typescript-eslint/no-explicit-any': 'off',
@@ -79,7 +78,7 @@ module.exports = {
     },
     // Entry.js rules
     {
-      files: ['packages/web/src/entry/index.js'],
+      files: ['packages/web/src/entry/index.jsx'],
       env: {
         es6: true,
         browser: true,
diff --git a/docs/docs/custom-web-index.md b/docs/docs/custom-web-index.md
index a713be6282bf..ad3d5ba04ea6 100644
--- a/docs/docs/custom-web-index.md
+++ b/docs/docs/custom-web-index.md
@@ -38,5 +38,5 @@ if (rootElement.hasChildNodes()) {
 }
 ```
 
-This's actually the same file Redwood uses [internally](https://github.com/redwoodjs/redwood/blob/main/packages/web/src/entry/index.js).
+This's actually the same file Redwood uses [internally](https://github.com/redwoodjs/redwood/blob/main/packages/web/src/entry/index.jsx).
 So even if you don't customize anything, things still work the way they did.
diff --git a/packages/cli/src/commands/setup/custom-web-index/custom-web-index.js b/packages/cli/src/commands/setup/custom-web-index/custom-web-index.js
index d561c63fee89..6ca4cf4d4abc 100644
--- a/packages/cli/src/commands/setup/custom-web-index/custom-web-index.js
+++ b/packages/cli/src/commands/setup/custom-web-index/custom-web-index.js
@@ -41,7 +41,7 @@ export const handler = async ({ force }) => {
               path.join(
                 getPaths().base,
                 // NOTE we're copying over the index.js before babel transform
-                'node_modules/@redwoodjs/web/src/entry/index.js'
+                'node_modules/@redwoodjs/web/src/entry/index.jsx'
               )
             )
             .toString()
diff --git a/packages/core/config/webpack.common.js b/packages/core/config/webpack.common.js
index 6694acb7b9b4..b02c2f9d749c 100644
--- a/packages/core/config/webpack.common.js
+++ b/packages/core/config/webpack.common.js
@@ -201,13 +201,13 @@ module.exports = (webpackEnv) => {
     entry: {
       /**
        * Prerender requires a top-level component.
-       * Before we had `ReactDOM` and a top-level component in the same file (web/index.js).
-       * If index.js is defined in the user's project, use that, if not
-       * use the one provided in web/dist/entry/index.js
+       * Before we had `ReactDOM` and a top-level component in the same file (web/index.jsx).
+       * If index.jsx is defined in the user's project, use that, if not
+       * use the one provided in web/dist/entry/index.jsx
        */
       app:
         redwoodPaths.web.index ||
-        require.resolve('@redwoodjs/web/dist/entry/index.js'),
+        require.resolve('@redwoodjs/web/dist/entry/index.jsx'),
     },
     resolve: {
       extensions: ['.wasm', '.mjs', '.js', '.jsx', '.ts', '.tsx', '.json'],
diff --git a/packages/web/src/entry/index.js b/packages/web/src/entry/index.jsx
similarity index 100%
rename from packages/web/src/entry/index.js
rename to packages/web/src/entry/index.jsx