diff --git a/ui-ngx/src/app/modules/home/pages/device/device-credentials-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/device/device-credentials-dialog.component.ts
index 4cfcc90a2a..73e5ae040f 100644
--- a/ui-ngx/src/app/modules/home/pages/device/device-credentials-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/device-credentials-dialog.component.ts
@@ -114,7 +114,7 @@ export class DeviceCredentialsDialogComponent extends
         let credentialsBasic = {clientId: null, userName: null, password: null};
         if (deviceCredentials.credentialsType === DeviceCredentialsType.MQTT_BASIC) {
           credentialsValue = null;
-          credentialsBasic = deviceCredentials.credentialsValue as DeviceCredentialMQTTBasic;
+          credentialsBasic = JSON.parse(deviceCredentials.credentialsValue) as DeviceCredentialMQTTBasic;
         }
         this.deviceCredentialsFormGroup.patchValue({
           credentialsType: deviceCredentials.credentialsType,
@@ -183,7 +183,7 @@ export class DeviceCredentialsDialogComponent extends
     this.submitted = true;
     const deviceCredentialsValue = this.deviceCredentialsFormGroup.value;
     if (deviceCredentialsValue.credentialsType === DeviceCredentialsType.MQTT_BASIC) {
-      deviceCredentialsValue.credentialsValue = deviceCredentialsValue.credentialsBasic;
+      deviceCredentialsValue.credentialsValue = JSON.stringify(deviceCredentialsValue.credentialsBasic);
     }
     delete deviceCredentialsValue.credentialsBasic;
     this.deviceCredentials = {...this.deviceCredentials, ...deviceCredentialsValue};
diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index a71c5db36c..fe92268b80 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/ui-ngx/src/app/shared/models/device.models.ts
@@ -308,7 +308,7 @@ export interface DeviceCredentials extends BaseData<DeviceCredentialsId> {
   deviceId: DeviceId;
   credentialsType: DeviceCredentialsType;
   credentialsId: string;
-  credentialsValue: string | DeviceCredentialMQTTBasic;
+  credentialsValue: string;
 }
 
 export interface DeviceCredentialMQTTBasic {