diff --git a/ros2rag.common/src/main/java/de/tudresden/inf/st/ros2rag/common/Util.java b/ros2rag.common/src/main/java/de/tudresden/inf/st/ros2rag/common/Util.java
index a7a910395550868efa893efbf8ade2057e7b7b61..5ba5e348651a11206b1a01ed919235eaff9d40f8 100644
--- a/ros2rag.common/src/main/java/de/tudresden/inf/st/ros2rag/common/Util.java
+++ b/ros2rag.common/src/main/java/de/tudresden/inf/st/ros2rag/common/Util.java
@@ -9,6 +9,7 @@ import de.tudresden.inf.st.ros2rag.common.DataConfiguration.ActualConfiguration;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.util.Map;
 import java.util.SortedMap;
 
@@ -24,7 +25,11 @@ public class Util {
     ObjectMapper mapper = new ObjectMapper(
         new YAMLFactory().configure(JsonParser.Feature.ALLOW_YAML_COMMENTS, true)
     );
-    return mapper.readValue(configFile, DataConfiguration.class).panda_mqtt_connector;
+    ActualConfiguration config = mapper.readValue(configFile, DataConfiguration.class).panda_mqtt_connector;
+    URI serverUri = URI.create(config.server);
+    config.server = serverUri.getHost() + ":" + (serverUri.getPort() == -1 ? 1883 : serverUri.getPort())
+        + serverUri.getPath();
+    return config;
   }
 
   public static void setMqttHost(SetHost handler, ActualConfiguration config) throws IOException {