diff --git a/ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.html
index 001502cd83..ea6427addd 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.html
@@ -29,11 +29,11 @@
         formControlName="configuration">
       </tb-mqtt-device-profile-transport-configuration>
     </ng-template>
-    <ng-template [ngSwitchCase]="deviceTransportType.LWM2M">
+    <!--ng-template [ngSwitchCase]="deviceTransportType.LWM2M">
       <tb-lwm2m-device-profile-transport-configuration
         [required]="required"
         formControlName="configuration">
       </tb-lwm2m-device-profile-transport-configuration>
-    </ng-template>
+    </ng-template-->
   </div>
 </div>
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m-device-profile-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m-device-profile-transport-configuration.component.ts
index ed81a143fd..7a7a1d285f 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m-device-profile-transport-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m-device-profile-transport-configuration.component.ts
@@ -89,7 +89,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
     let configuration: DeviceProfileTransportConfiguration = null;
     if (this.lwm2mDeviceProfileTransportConfigurationFormGroup.valid) {
       configuration = this.lwm2mDeviceProfileTransportConfigurationFormGroup.getRawValue().configuration;
-      configuration.type = DeviceTransportType.LWM2M;
+      // configuration.type = DeviceTransportType.LWM2M;
     }
     this.propagateChange(configuration);
   }
diff --git a/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.ts b/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.ts
index 9def61c4b6..9e861c1359 100644
--- a/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.ts
@@ -26,7 +26,7 @@ import {
   createDeviceProfileTransportConfiguration,
   DeviceProfile,
   DeviceProfileType,
-  DeviceTransportType, deviceTransportTypeHintMap,
+  DeviceTransportType, deviceTransportTypeConfigurationInfoMap, deviceTransportTypeHintMap,
   deviceTransportTypeTranslationMap
 } from '@shared/models/device.models';
 import { MatHorizontalStepper } from '@angular/material/stepper';
@@ -123,7 +123,7 @@ export class DeviceWizardDialogComponent extends
           this.deviceWizardFormGroup.updateValueAndValidity();
           this.createProfile = true;
           this.createTransportConfiguration = this.deviceWizardFormGroup.get('transportType').value &&
-            DeviceTransportType.DEFAULT !== this.deviceWizardFormGroup.get('transportType').value;
+            deviceTransportTypeConfigurationInfoMap.get(this.deviceWizardFormGroup.get('transportType').value).hasProfileConfiguration;
         }
       }
     ));
@@ -228,7 +228,7 @@ export class DeviceWizardDialogComponent extends
     this.transportConfigFormGroup.patchValue(
       {transportConfiguration: createDeviceProfileTransportConfiguration(deviceTransportType)});
     this.createTransportConfiguration = this.createProfile && deviceTransportType &&
-      DeviceTransportType.DEFAULT !== deviceTransportType;
+      deviceTransportTypeConfigurationInfoMap.get(deviceTransportType).hasProfileConfiguration;
   }
 
   add(): void {
diff --git a/ui-ngx/src/app/modules/home/pages/device/data/default-device-configuration.component.html b/ui-ngx/src/app/modules/home/pages/device/data/default-device-configuration.component.html
index a1d4919b5c..001cc16801 100644
--- a/ui-ngx/src/app/modules/home/pages/device/data/default-device-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device/data/default-device-configuration.component.html
@@ -16,9 +16,9 @@
 
 -->
 <form [formGroup]="defaultDeviceConfigurationFormGroup" style="padding-bottom: 16px;">
-  <tb-json-object-edit
+  <!--tb-json-object-edit
     [required]="required"
     label="{{ 'device-profile.type-default' | translate }}"
     formControlName="configuration">
-  </tb-json-object-edit>
+  </tb-json-object-edit-->
 </form>
diff --git a/ui-ngx/src/app/modules/home/pages/device/data/default-device-transport-configuration.component.html b/ui-ngx/src/app/modules/home/pages/device/data/default-device-transport-configuration.component.html
index cd2d53aab0..68189fbb84 100644
--- a/ui-ngx/src/app/modules/home/pages/device/data/default-device-transport-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device/data/default-device-transport-configuration.component.html
@@ -16,9 +16,9 @@
 
 -->
 <form [formGroup]="defaultDeviceTransportConfigurationFormGroup" style="padding-bottom: 16px;">
-  <tb-json-object-edit
+  <!--tb-json-object-edit
     [required]="required"
     label="{{ 'device-profile.transport-type-default' | translate }}"
     formControlName="configuration">
-  </tb-json-object-edit>
+  </tb-json-object-edit-->
 </form>
diff --git a/ui-ngx/src/app/modules/home/pages/device/data/device-transport-configuration.component.html b/ui-ngx/src/app/modules/home/pages/device/data/device-transport-configuration.component.html
index f109335edc..6762202f06 100644
--- a/ui-ngx/src/app/modules/home/pages/device/data/device-transport-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device/data/device-transport-configuration.component.html
@@ -29,11 +29,11 @@
         formControlName="configuration">
       </tb-mqtt-device-transport-configuration>
     </ng-template>
-    <ng-template [ngSwitchCase]="deviceTransportType.LWM2M">
+    <!--ng-template [ngSwitchCase]="deviceTransportType.LWM2M">
       <tb-lwm2m-device-transport-configuration
         [required]="required"
         formControlName="configuration">
       </tb-lwm2m-device-transport-configuration>
-    </ng-template>
+    </ng-template-->
   </div>
 </div>
diff --git a/ui-ngx/src/app/modules/home/pages/device/data/lwm2m-device-transport-configuration.component.html b/ui-ngx/src/app/modules/home/pages/device/data/lwm2m-device-transport-configuration.component.html
index 3fdccba628..4a90cf6ecf 100644
--- a/ui-ngx/src/app/modules/home/pages/device/data/lwm2m-device-transport-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device/data/lwm2m-device-transport-configuration.component.html
@@ -16,9 +16,9 @@
 
 -->
 <form [formGroup]="lwm2mDeviceTransportConfigurationFormGroup" style="padding-bottom: 16px;">
-  <tb-json-object-edit
+  <!--tb-json-object-edit
     [required]="required"
     label="{{ 'device-profile.transport-type-lwm2m' | translate }}"
     formControlName="configuration">
-  </tb-json-object-edit>
+  </tb-json-object-edit-->
 </form>
diff --git a/ui-ngx/src/app/modules/home/pages/device/data/lwm2m-device-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/pages/device/data/lwm2m-device-transport-configuration.component.ts
index 05e1448bc3..f20f481824 100644
--- a/ui-ngx/src/app/modules/home/pages/device/data/lwm2m-device-transport-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/data/lwm2m-device-transport-configuration.component.ts
@@ -89,7 +89,7 @@ export class Lwm2mDeviceTransportConfigurationComponent implements ControlValueA
     let configuration: DeviceTransportConfiguration = null;
     if (this.lwm2mDeviceTransportConfigurationFormGroup.valid) {
       configuration = this.lwm2mDeviceTransportConfigurationFormGroup.getRawValue().configuration;
-      configuration.type = DeviceTransportType.LWM2M;
+      // configuration.type = DeviceTransportType.LWM2M;
     }
     this.propagateChange(configuration);
   }
diff --git a/ui-ngx/src/app/modules/home/pages/device/data/mqtt-device-transport-configuration.component.html b/ui-ngx/src/app/modules/home/pages/device/data/mqtt-device-transport-configuration.component.html
index e21bb3818a..9e7390e8d7 100644
--- a/ui-ngx/src/app/modules/home/pages/device/data/mqtt-device-transport-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device/data/mqtt-device-transport-configuration.component.html
@@ -16,9 +16,9 @@
 
 -->
 <form [formGroup]="mqttDeviceTransportConfigurationFormGroup" style="padding-bottom: 16px;">
-  <tb-json-object-edit
+  <!--tb-json-object-edit
     [required]="required"
     label="{{ 'device-profile.transport-type-mqtt' | translate }}"
     formControlName="configuration">
-  </tb-json-object-edit>
+  </tb-json-object-edit-->
 </form>
diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index 0bbc93eb12..4f27fc1db8 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/ui-ngx/src/app/shared/models/device.models.ts
@@ -33,7 +33,7 @@ export enum DeviceProfileType {
 export enum DeviceTransportType {
   DEFAULT = 'DEFAULT',
   MQTT = 'MQTT',
-  LWM2M = 'LWM2M'
+//  LWM2M = 'LWM2M'
 }
 
 export enum MqttTransportPayloadType {
@@ -68,7 +68,7 @@ export const deviceTransportTypeTranslationMap = new Map<DeviceTransportType, st
   [
     [DeviceTransportType.DEFAULT, 'device-profile.transport-type-default'],
     [DeviceTransportType.MQTT, 'device-profile.transport-type-mqtt'],
-    [DeviceTransportType.LWM2M, 'device-profile.transport-type-lwm2m']
+ //   [DeviceTransportType.LWM2M, 'device-profile.transport-type-lwm2m']
   ]
 );
 
@@ -76,7 +76,7 @@ export const deviceTransportTypeHintMap = new Map<DeviceTransportType, string>(
   [
     [DeviceTransportType.DEFAULT, 'device-profile.transport-type-default-hint'],
     [DeviceTransportType.MQTT, 'device-profile.transport-type-mqtt-hint'],
-    [DeviceTransportType.LWM2M, 'device-profile.transport-type-lwm2m-hint']
+ //   [DeviceTransportType.LWM2M, 'device-profile.transport-type-lwm2m-hint']
   ]
 );
 
@@ -101,16 +101,16 @@ export const deviceTransportTypeConfigurationInfoMap = new Map<DeviceTransportTy
       DeviceTransportType.MQTT,
       {
         hasProfileConfiguration: true,
-        hasDeviceConfiguration: true,
+        hasDeviceConfiguration: false,
       }
     ],
-    [
+    /*[
       DeviceTransportType.LWM2M,
       {
         hasProfileConfiguration: true,
-        hasDeviceConfiguration: true,
+        hasDeviceConfiguration: false,
       }
-    ]
+    ]*/
   ]
 );
 
@@ -188,10 +188,10 @@ export function createDeviceProfileTransportConfiguration(type: DeviceTransportT
         };
         transportConfiguration = {...mqttTransportConfiguration, type: DeviceTransportType.MQTT};
         break;
-      case DeviceTransportType.LWM2M:
+      /*case DeviceTransportType.LWM2M:
         const lwm2mTransportConfiguration: Lwm2mDeviceProfileTransportConfiguration = {};
         transportConfiguration = {...lwm2mTransportConfiguration, type: DeviceTransportType.LWM2M};
-        break;
+        break;*/
     }
   }
   return transportConfiguration;
@@ -209,10 +209,10 @@ export function createDeviceTransportConfiguration(type: DeviceTransportType): D
         const mqttTransportConfiguration: MqttDeviceTransportConfiguration = {};
         transportConfiguration = {...mqttTransportConfiguration, type: DeviceTransportType.MQTT};
         break;
-      case DeviceTransportType.LWM2M:
+      /* case DeviceTransportType.LWM2M:
         const lwm2mTransportConfiguration: Lwm2mDeviceTransportConfiguration = {};
         transportConfiguration = {...lwm2mTransportConfiguration, type: DeviceTransportType.LWM2M};
-        break;
+        break;*/
     }
   }
   return transportConfiguration;