diff --git a/ui-ngx/src/app/modules/home/pages/device/data/device-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/pages/device/data/device-transport-configuration.component.ts
index 01e5584a57..58465dd207 100644
--- a/ui-ngx/src/app/modules/home/pages/device/data/device-transport-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/data/device-transport-configuration.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import { Component, forwardRef, Input, OnDestroy, OnInit } from '@angular/core';
 import {
   ControlValueAccessor,
   UntypedFormBuilder,
@@ -30,6 +30,7 @@ import { AppState } from '@app/core/core.state';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { DeviceTransportConfiguration, DeviceTransportType } from '@shared/models/device.models';
 import { deepClone } from '@core/utils';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'tb-device-transport-configuration',
@@ -104,9 +105,9 @@ export class DeviceTransportConfigurationComponent implements ControlValueAccess
     if (configuration) {
       delete configuration.type;
     }
-    setTimeout(() => {
+    // setTimeout(() => {
       this.deviceTransportConfigurationFormGroup.patchValue({configuration}, {emitEvent: false});
-    }, 0);
+    // }, 0);
   }
 
   validate(): ValidationErrors | null {
diff --git a/ui-ngx/src/app/modules/home/pages/device/data/snmp-device-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/pages/device/data/snmp-device-transport-configuration.component.ts
index 29ac39ee6a..26b70396d9 100644
--- a/ui-ngx/src/app/modules/home/pages/device/data/snmp-device-transport-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/data/snmp-device-transport-configuration.component.ts
@@ -127,6 +127,9 @@ export class SnmpDeviceTransportConfigurationComponent implements ControlValueAc
       this.snmpDeviceTransportConfigurationFormGroup.disable({emitEvent: false});
     } else {
       this.snmpDeviceTransportConfigurationFormGroup.enable({emitEvent: false});
+      this.updateDisabledFormValue(
+        this.snmpDeviceTransportConfigurationFormGroup.get('protocolVersion').value || SnmpDeviceProtocolVersion.V2C
+      );
     }
   }