diff --git a/lib/Helpers/MQTTHelper.dart b/lib/Helpers/MQTTHelper.dart
index 859f27d..96fc469 100644
--- a/lib/Helpers/MQTTHelper.dart
+++ b/lib/Helpers/MQTTHelper.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -107,7 +108,13 @@ class MQTTHelper {
     TabletAppContext tabletAppContext = appContext.getContext();
 
     var identifier = await DeviceInfoHelper.getDeviceDetails();
-    tabletAppContext.clientMQTT = MqttServerClient.withPort(tabletAppContext.host.replaceAll('http://', ''), 'tablet_app_'+identifier, 1883);
+    var hostToTake = tabletAppContext.host;
+    if(tabletAppContext.host.lastIndexOf(":") > 5)
+    {
+      hostToTake = tabletAppContext.host.substring(0,tabletAppContext.host.lastIndexOf(":"));
+    }
+
+    tabletAppContext.clientMQTT = MqttServerClient.withPort(hostToTake.replaceAll('http://', ''), 'tablet_app_'+identifier, 1883);
     isInstantiated = true;
 
     tabletAppContext.clientMQTT.logging(on: false);