diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
index 7427ec1fc1..36a4365544 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
@@ -295,7 +295,7 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
     }
 
     @Test
-    public void testFetchPublishTelemetryCommandsForСoapDevice() throws Exception {
+    public void testFetchPublishTelemetryCommandsForCoapDevice() throws Exception {
         Device device = new Device();
         device.setName("My device");
         device.setDeviceProfileId(coapDeviceProfileId);
@@ -317,7 +317,7 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
     }
 
     @Test
-    public void testFetchPublishTelemetryCommandsForСoapDeviceWithX509Creds() throws Exception {
+    public void testFetchPublishTelemetryCommandsForCoapDeviceWithX509Creds() throws Exception {
         Device device = new Device();
         device.setName("My device");
         device.setDeviceProfileId(coapDeviceProfileId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java
index 32a582ba07..c06103d8f3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java
@@ -91,10 +91,17 @@ public class DeviceConnectivityServiceImpl implements DeviceConnectivityService
             case MQTT:
                 MqttDeviceProfileTransportConfiguration transportConfiguration =
                         (MqttDeviceProfileTransportConfiguration) deviceProfile.getProfileData().getTransportConfiguration();
-                String topicName = transportConfiguration.getDeviceTelemetryTopic();
-
-                Optional.ofNullable(getMqttTransportPublishCommands(baseUrl, topicName, creds))
-                        .ifPresent(v -> commands.set(MQTT, v));
+                //TODO: add sparkplug command with emulator (check SSL)
+                if (transportConfiguration.isSparkplug()) {
+                    ObjectNode sparkplug = JacksonUtil.newObjectNode();
+                    sparkplug.put("sparkplug", CHECK_DOCUMENTATION);
+                    commands.set(MQTT, sparkplug);
+                } else {
+                    String topicName = transportConfiguration.getDeviceTelemetryTopic();
+
+                    Optional.ofNullable(getMqttTransportPublishCommands(baseUrl, topicName, creds))
+                            .ifPresent(v -> commands.set(MQTT, v));
+                }
                 break;
             case COAP:
                 Optional.ofNullable(getCoapTransportPublishCommands(baseUrl, creds))