diff --git a/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttClientService.java b/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttClientService.java
index d5e9a132..787cc9a6 100644
--- a/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttClientService.java
+++ b/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttClientService.java
@@ -49,7 +49,7 @@ public IMqttClient create(OnboardingResponse onboardingResponse) {
   public IMqttClient create(RouterDevice routerDevice) {
     return this.createMqttClient(
         routerDevice.getConnectionCriteria().getHost(),
-        routerDevice.getConnectionCriteria().getHost(),
+        String.valueOf(routerDevice.getConnectionCriteria().getPort()),
         routerDevice.getDeviceAlternateId());
   }