diff --git a/client/wfprev-war/src/main/angular/src/app/services/util/can-deactive.guard.ts b/client/wfprev-war/src/main/angular/src/app/services/util/can-deactive.guard.ts
index 9edd214db..2e9540281 100644
--- a/client/wfprev-war/src/main/angular/src/app/services/util/can-deactive.guard.ts
+++ b/client/wfprev-war/src/main/angular/src/app/services/util/can-deactive.guard.ts
@@ -12,7 +12,7 @@ export interface CanComponentDeactivate {
 export class CanDeactivateGuard implements CanDeactivate<CanComponentDeactivate> {
   canDeactivate(component: CanComponentDeactivate): Observable<boolean> | Promise<boolean> | boolean {
     // If the component doesn't have canDeactivate, allow navigation
-    if (!component || !Object.hasOwn(component, 'canDeactivate')) {
+    if (!component?.canDeactivate) {
       return true;
     }