diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 15a75b0e..00000000
--- a/.eslintignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules
-dist
-README.md
-COPYING
-src/webrtc
-scripts/
-assets
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 40eac134..00000000
--- a/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
-	"parser": "@typescript-eslint/parser",
-	"plugins": ["@typescript-eslint"],
-	"root": true,
-	"rules": {
-		"no-mixed-spaces-and-tabs": "off",
-		"@typescript-eslint/no-inferrable-types": "off", // Required by typeorm
-		"@typescript-eslint/no-var-requires": "off" // Sometimes requred by typeorm to resolve circular deps
-	},
-	"env": {
-		"node": true
-	}
-}
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000..a4209123
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,45 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import globals from "globals";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: [
+        "**/node_modules",
+        "**/dist",
+        "**/README.md",
+        "**/COPYING",
+        "src/webrtc",
+        "**/scripts/",
+        "**/assets",
+    ],
+}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"), {
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+    },
+
+    languageOptions: {
+        globals: {
+            ...globals.node,
+        },
+
+        parser: tsParser,
+    },
+
+    rules: {
+        "no-mixed-spaces-and-tabs": "off",
+        "@typescript-eslint/no-inferrable-types": "off", // Required by typeorm
+        "@typescript-eslint/no-var-requires": "off", // Sometimes requred by typeorm to resolve circular deps
+    },
+}];
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9d91c0e6..7ea21c4e 100644
Binary files a/package-lock.json and b/package-lock.json differ
diff --git a/package.json b/package.json
index b87dc6fc..c2f3536d 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,8 @@
 	},
 	"homepage": "https://spacebar.chat",
 	"devDependencies": {
+		"@eslint/eslintrc": "^3.1.0",
+		"@eslint/js": "^9.14.0",
 		"@types/amqplib": "^0.10.5",
 		"@types/bcrypt": "^5.0.2",
 		"@types/body-parser": "^1.19.5",
@@ -61,6 +63,7 @@
 		"@typescript-eslint/parser": "^8.12.2",
 		"eslint": "^9.13.0",
 		"express": "^4.21.1",
+		"globals": "^15.12.0",
 		"husky": "^9.1.6",
 		"prettier": "^3.3.3",
 		"pretty-quick": "^4.0.0",