diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.ts
index b5d0cc4d8d..b083439ef7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.ts
@@ -228,10 +228,9 @@ export class MappingDialogComponent extends DialogComponent<MappingDialogCompone
         requestValueGroup.get('attributeRequests').disable({emitEvent: false});
         requestValueGroup.get('attributeUpdates').disable({emitEvent: false});
         requestValueGroup.get('serverSideRpc').disable({emitEvent: false});
-        requestValueGroup.get(value).enable({emitEvent: false});
+        requestValueGroup.get(value).enable();
       });
       this.mappingForm.get('requestValue.serverSideRpc.type').valueChanges.pipe(
-        startWith(this.mappingForm.get('requestValue.serverSideRpc.type').value),
         takeUntil(this.destroy$)
       ).subscribe((value) => {
         const requestValueGroup = this.mappingForm.get('requestValue.serverSideRpc');