diff --git a/projects/multidirectory-app/src/app/components/modals/components/dialogs/entity-properties-dialog/entity-properties-dialog.component.html b/projects/multidirectory-app/src/app/components/modals/components/dialogs/entity-properties-dialog/entity-properties-dialog.component.html
index 32ab7ebd..97bc966d 100644
--- a/projects/multidirectory-app/src/app/components/modals/components/dialogs/entity-properties-dialog/entity-properties-dialog.component.html
+++ b/projects/multidirectory-app/src/app/components/modals/components/dialogs/entity-properties-dialog/entity-properties-dialog.component.html
@@ -22,7 +22,7 @@
   </div>
 
   <div class="app-modal-footer flex justify-end">
-    <md-button (click)="save(userProps?.generalPropertiesValid)" class="pr-8">{{
+    <md-button (click)="save(true)" class="pr-8">{{
       'properties-modal.close' | transloco
     }}</md-button>
     <md-button (click)="save(false)" [disabled]="userProps && !userProps.generalPropertiesValid" [primary]="true"
diff --git a/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts b/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts
index ea332be9..5bcb564f 100644
--- a/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts
+++ b/projects/multidirectory-app/src/app/features/dhcp/dhcp-setup-wizard/dhcp-setup-wizard.component.ts
@@ -134,7 +134,7 @@ export class DHCPSetupWizardComponent {
       minutes: [this.isResetForm ? date.minutes : '', [Validators.required, Validators.max(60)]],
       subnetMask: [this.isResetForm ? this.dialogData?.subnet : '', []],
       defaultGateway: [
-        this.isResetForm ? this.dialogData?.default_gateway : '',
+        this.isResetForm ? this.dialogData?.default_gateway : null,
         [Validators.pattern(this.ipReg)],
       ],
     });
diff --git a/projects/multidirectory-app/src/app/models/api/dhcp/dhcp-create-subnet-response.ts b/projects/multidirectory-app/src/app/models/api/dhcp/dhcp-create-subnet-response.ts
index f1abba99..e1a76a7c 100644
--- a/projects/multidirectory-app/src/app/models/api/dhcp/dhcp-create-subnet-response.ts
+++ b/projects/multidirectory-app/src/app/models/api/dhcp/dhcp-create-subnet-response.ts
@@ -5,7 +5,7 @@ export class DhcpCreateSubnetRequest {
   subnet = '';
   pool = '';
   valid_lifetime = 0;
-  default_gateway = '';
+  default_gateway: string | null = null;
 
   constructor(obj: Partial<DhcpCreateSubnetRequest>) {
     Object.assign(this, obj);
@@ -20,7 +20,7 @@ export interface DhcpCreateSubnetResponse {
 export class DhcpUpdateSubnetRequest {
   subnet = '';
   pool = '';
-  default_gateway = '';
+  default_gateway: string | null = null;
 
   constructor(obj: Partial<DhcpUpdateSubnetRequest>) {
     Object.assign(this, obj);