diff --git a/projects/multidirectory-app/src/app/components/modals/components/dialogs/entity-properties-dialog/entity-properties-dialog.component.ts b/projects/multidirectory-app/src/app/components/modals/components/dialogs/entity-properties-dialog/entity-properties-dialog.component.ts
index 8da67c7d..8dd62e3a 100644
--- a/projects/multidirectory-app/src/app/components/modals/components/dialogs/entity-properties-dialog/entity-properties-dialog.component.ts
+++ b/projects/multidirectory-app/src/app/components/modals/components/dialogs/entity-properties-dialog/entity-properties-dialog.component.ts
@@ -88,7 +88,7 @@ export class EntityPropertiesDialogComponent implements OnInit {
     this.dialogComponent.showSpinner();
     const updateRequest = this.attributeService.createAttributeUpdateRequest(this.accessor);
 
-    if (updateRequest.changes.length === 0 || !this.userProps?.generalPropertiesValid) {
+    if (updateRequest.changes.length === 0 || (this.userProps && !this.userProps.generalPropertiesValid)) {
       this.dialogComponent.hideSpinner();
       this.close();