diff --git a/infra/dev/Makefile b/infra/dev/Makefile
index f63d69ccc..43b6f364f 100644
--- a/infra/dev/Makefile
+++ b/infra/dev/Makefile
@@ -31,6 +31,8 @@ server-start:
 
 server-prisma-generate:
 	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run prisma:generate"
+	@echo "Linting generated files..."
+	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run prisma:lint"
 
 server-prisma-migrate:
 	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run prisma:migrate"
diff --git a/server/package.json b/server/package.json
index a794bd1b6..6c55799f3 100644
--- a/server/package.json
+++ b/server/package.json
@@ -21,7 +21,8 @@
     "test:e2e": "jest --config ./test/jest-e2e.json",
     "prisma:generate": "npx prisma generate",
     "prisma:migrate": "npx prisma migrate deploy",
-    "prisma:seed": "npx prisma db seed"
+    "prisma:seed": "npx prisma db seed",
+    "prisma:lint": "eslint \"src/api/@generated/**\" --fix"
   },
   "dependencies": {
     "@nestjs/apollo": "^11.0.5",