diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceСonnectivityServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceСonnectivityServiceImpl.java
index e15056a2a6..e7bfefabbd 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceСonnectivityServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceСonnectivityServiceImpl.java
@@ -156,8 +156,12 @@ public class DeviceСonnectivityServiceImpl implements DeviceConnectivityService
                 .ifPresent(v -> mqttCommands.put(MQTT, v));
         List<String> mqttsPublishCommand = getMqttsPublishCommand(baseUrl, topic, deviceCredentials);
         if (mqttsPublishCommand != null){
-            ArrayNode arrayNode = mqttCommands.putArray(MQTTS);
-            mqttsPublishCommand.forEach(arrayNode::add);
+            if (mqttsPublishCommand.size() > 1) {
+                ArrayNode arrayNode = mqttCommands.putArray(MQTTS);
+                mqttsPublishCommand.forEach(arrayNode::add);
+            } else {
+                mqttCommands.put(MQTTS, mqttsPublishCommand.get(0));
+            }
         }
 
         ObjectNode dockerMqttCommands = JacksonUtil.newObjectNode();
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java b/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java
index e99df56e64..dad405b093 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java
@@ -19,9 +19,6 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DeviceConnectivityUtil {
 
     public static final String HTTP = "http";
diff --git a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss
index 1a95da0a14..e50b46d9fc 100644
--- a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss
@@ -123,6 +123,7 @@
           margin: 0;
           background: #F3F6FA;
           border-color: #305680;
+          padding-right: 38px;
         }
       }
       button.clipboard-btn {
diff --git a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.ts
index f185d88c6a..07da1a43ed 100644
--- a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.ts
@@ -171,7 +171,7 @@ export class DeviceCheckConnectivityDialogComponent extends
     if (Array.isArray(commands)) {
       const formatCommands: Array<string> = [];
       commands.forEach(command => formatCommands.push(this.createMarkDownSingleCommand(command)));
-      return formatCommands.join('<br />\n');
+      return formatCommands.join(`\n<br />\n\n`);
     } else {
       return this.createMarkDownSingleCommand(commands);
     }