diff --git a/ui-ngx/src/app/modules/home/components/profile/device-profile-provision-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/device-profile-provision-configuration.component.ts
index 9793af2748..e25c07e005 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device-profile-provision-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device-profile-provision-configuration.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, forwardRef, Input, OnInit } from "@angular/core";
+import { Component, forwardRef, Input, OnInit } from '@angular/core';
 import {
   ControlValueAccessor,
   FormBuilder,
@@ -25,13 +25,13 @@ import {
   ValidationErrors,
   Validator,
   Validators
-} from "@angular/forms";
-import { coerceBooleanProperty } from "@angular/cdk/coercion";
+} from '@angular/forms';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import {
   DeviceProvisionConfiguration,
   DeviceProvisionType,
   deviceProvisionTypeTranslationMap
-} from "@shared/models/device.models";
+} from '@shared/models/device.models';
 import { generateSecret, isDefinedAndNotNull } from '@core/utils';
 
 @Component({
@@ -126,7 +126,11 @@ export class DeviceProfileProvisionConfigurationComponent implements ControlValu
     if (this.disabled){
       this.provisionConfigurationFormGroup.disable();
     } else {
-      this.provisionConfigurationFormGroup.enable({emitEvent: false});
+      if (this.provisionConfigurationFormGroup.get('type').value !== DeviceProvisionType.DISABLED) {
+        this.provisionConfigurationFormGroup.enable({emitEvent: false});
+      } else {
+        this.provisionConfigurationFormGroup.get('type').enable({emitEvent: false});
+      }
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/profile/device-profile.component.ts b/ui-ngx/src/app/modules/home/components/profile/device-profile.component.ts
index 09223491e1..e837caf660 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device-profile.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device-profile.component.ts
@@ -94,8 +94,6 @@ export class DeviceProfileComponent extends EntityComponent<DeviceProfile> {
         name: [entity ? entity.name : '', [Validators.required]],
         type: [entity ? entity.type : null, [Validators.required]],
         transportType: [entity ? entity.transportType : null, [Validators.required]],
-        provisionType: [deviceProvisionConfiguration.type, [Validators.required]],
-        provisionDeviceKey: [deviceProvisionConfiguration.provisionDeviceKey],
         profileData: this.fb.group({
           configuration: [entity && !this.isAdd ? entity.profileData?.configuration : {}, Validators.required],
           transportConfiguration: [entity && !this.isAdd ? entity.profileData?.transportConfiguration : {}, Validators.required],