diff --git a/src/frontend/servers/y-provider/.eslintrc.cjs b/src/frontend/servers/y-provider/.eslintrc.cjs
deleted file mode 100644
index 9e0dff2a..00000000
--- a/src/frontend/servers/y-provider/.eslintrc.cjs
+++ /dev/null
@@ -1,17 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['impress/jest', 'impress/next'],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-  },
-  settings: {
-    next: {
-      rootDir: __dirname,
-    },
-  },
-  rules: {
-    '@next/next/no-html-link-for-pages': 'off',
-  },
-  ignorePatterns: ['node_modules'],
-};
diff --git a/src/frontend/servers/y-provider/__tests__/collaborationResetConnections.test.ts b/src/frontend/servers/y-provider/__tests__/collaborationResetConnections.test.ts
index 91841cfc..404d8906 100644
--- a/src/frontend/servers/y-provider/__tests__/collaborationResetConnections.test.ts
+++ b/src/frontend/servers/y-provider/__tests__/collaborationResetConnections.test.ts
@@ -58,7 +58,6 @@ describe('Server Tests', () => {
     expect(response.status).toBe(200);
     expect(response.body).toStrictEqual({ message: 'Connections reset' });
 
-    // eslint-disable-next-line jest/unbound-method
     expect(closeConnectionsMock).toHaveBeenCalledOnce();
   });
 });
diff --git a/src/frontend/servers/y-provider/eslint.config.mjs b/src/frontend/servers/y-provider/eslint.config.mjs
new file mode 100644
index 00000000..92bd0338
--- /dev/null
+++ b/src/frontend/servers/y-provider/eslint.config.mjs
@@ -0,0 +1,26 @@
+import { defineConfig } from '@eslint/config-helpers';
+import docsPlugin from 'eslint-plugin-docs';
+
+const eslintConfig = defineConfig([
+  {
+    ignores: ['dist/**'],
+  },
+  {
+    files: ['**/*.mjs', '**/*.ts', '**/*.tsx'],
+    plugins: {
+      docs: docsPlugin,
+    },
+    extends: ['docs/next'],
+    languageOptions: {
+      parserOptions: {
+        tsconfigRootDir: import.meta.dirname,
+        project: ['./tsconfig.json'],
+      },
+    },
+    rules: {
+      '@next/next/no-html-link-for-pages': 'off',
+    },
+  },
+]);
+
+export default eslintConfig;
diff --git a/src/frontend/servers/y-provider/package.json b/src/frontend/servers/y-provider/package.json
index f552cbc2..c40c8706 100644
--- a/src/frontend/servers/y-provider/package.json
+++ b/src/frontend/servers/y-provider/package.json
@@ -9,7 +9,7 @@
     "build": "tsc -p tsconfig.build.json && tsc-alias",
     "dev": "cross-env COLLABORATION_LOGGING=true && nodemon --config nodemon.json",
     "start": "node ./dist/start-server.js",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint",
     "test": "vitest --run --disable-console-intercept"
   },
   "engines": {
diff --git a/src/frontend/servers/y-provider/src/servers/hocuspocusServer.ts b/src/frontend/servers/y-provider/src/servers/hocuspocusServer.ts
index 376e8ae0..afa6d9cf 100644
--- a/src/frontend/servers/y-provider/src/servers/hocuspocusServer.ts
+++ b/src/frontend/servers/y-provider/src/servers/hocuspocusServer.ts
@@ -74,9 +74,12 @@ export const hocuspocusServer = Server.configure({
      */
     try {
       const user = await fetchCurrentUser(requestHeaders);
+
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       context.userId = user.id;
-    } catch {}
+    } catch {
+      /* empty */
+    }
 
     logger(
       'Connection established on room:',
diff --git a/src/frontend/servers/y-provider/tsconfig.build.json b/src/frontend/servers/y-provider/tsconfig.build.json
index c14ab509..64ed0364 100644
--- a/src/frontend/servers/y-provider/tsconfig.build.json
+++ b/src/frontend/servers/y-provider/tsconfig.build.json
@@ -3,5 +3,6 @@
   "compilerOptions": {
     "rootDir": "./src",
   },
+  "include": ["**/*.ts"],
   "exclude": ["node_modules", "dist", "__tests__"],
 }
diff --git a/src/frontend/servers/y-provider/tsconfig.json b/src/frontend/servers/y-provider/tsconfig.json
index 120bda63..1d16a8b8 100644
--- a/src/frontend/servers/y-provider/tsconfig.json
+++ b/src/frontend/servers/y-provider/tsconfig.json
@@ -21,6 +21,6 @@
     "resolveFullPaths": true,
     "verbose": false
   },
-  "include": ["**/*.ts"],
+  "include": ["**/*.ts", "**/*.mjs"],
   "exclude": ["node_modules"]
 }