diff --git a/eslint.config.js b/eslint.config.js
index 2417d85e5..6a08cedf6 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -139,7 +139,6 @@ export default tseslint.config(
       ],
 
       // TODO: to be enabled later
-      "@typescript-eslint/ban-ts-comment": "off",
       "@typescript-eslint/consistent-type-definitions": "off",
       "@typescript-eslint/array-type": "off",
 
diff --git a/tests/integration/util.test.ts b/tests/integration/util.test.ts
index 206cd0033..a2f83b7f7 100644
--- a/tests/integration/util.test.ts
+++ b/tests/integration/util.test.ts
@@ -80,9 +80,7 @@ describe("integration testing helper functions", () => {
     });
 
     it("should return an empty array when schema is null or undefined", () => {
-      // @ts-expect-error
       expect(zodKeys(null)).toEqual([]);
-      // @ts-expect-error
       expect(zodKeys(undefined)).toEqual([]);
     });
 
diff --git a/tests/integration/util.ts b/tests/integration/util.ts
index 7734851de..a911ad88e 100644
--- a/tests/integration/util.ts
+++ b/tests/integration/util.ts
@@ -39,7 +39,9 @@ export function compileAllStrapiPages(
  * Massive if branching is needed, as Zod has different ways of encoding
  * a schema's keys for each data type
  */
-export function zodKeys<T extends z.ZodTypeAny>(schema: T): string[] {
+export function zodKeys<T extends z.ZodTypeAny | null | undefined>(
+  schema: T,
+): string[] {
   // make sure schema is not null or undefined
   if (schema === null || schema === undefined) return [];
   // check if schema is nullable or optional