diff --git a/.eslintrc.json b/.eslintrc.json
index 41157718..259b0a9c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -143,7 +143,6 @@
         // The following rules are part of @typescript-eslint/stylistic-type-checked
         // and can be remove once solved
         "@typescript-eslint/prefer-nullish-coalescing": "warn", // TODO: Requires strictNullChecks: true
-        "@typescript-eslint/prefer-optional-chain": "warn",
         "@typescript-eslint/consistent-indexed-object-style": "warn",
         "@typescript-eslint/consistent-generic-constructors": "warn"
       }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f049bed0..716b8c7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Switched the `consistent-type-assertions` rule from `warn` to `error` in the `eslint` configuration
+- Switched the `prefer-optional-chain` rule from `warn` to `error` in the `eslint` configuration
 
 ## 2.119.0 - 2024-10-26
 
diff --git a/apps/api/src/helper/object.helper.ts b/apps/api/src/helper/object.helper.ts
index c6d82559..a5854e9d 100644
--- a/apps/api/src/helper/object.helper.ts
+++ b/apps/api/src/helper/object.helper.ts
@@ -40,7 +40,7 @@ export function redactAttributes({
   object: any;
   options: { attribute: string; valueMap: { [key: string]: any } }[];
 }): any {
-  if (!object || !options || !options.length) {
+  if (!object || !options?.length) {
     return object;
   }
 
diff --git a/libs/ui/src/lib/shared/abstract-mat-form-field.ts b/libs/ui/src/lib/shared/abstract-mat-form-field.ts
index 05491b8a..8c2d19fc 100644
--- a/libs/ui/src/lib/shared/abstract-mat-form-field.ts
+++ b/libs/ui/src/lib/shared/abstract-mat-form-field.ts
@@ -112,7 +112,7 @@ export abstract class AbstractMatFormField<T>
   public _disabled: boolean = false;
 
   public get disabled() {
-    if (this.ngControl && this.ngControl.disabled !== null) {
+    if (this.ngControl?.disabled !== null) {
       return this.ngControl.disabled;
     }