diff --git a/src/rdkafka_transport.c b/src/rdkafka_transport.c
index f2d502ab13..3519a72cae 100644
--- a/src/rdkafka_transport.c
+++ b/src/rdkafka_transport.c
@@ -581,6 +581,11 @@ void rd_kafka_transport_post_connect_setup(rd_kafka_transport_t *rktrans) {
  * Locality: broker thread
  */
 static void rd_kafka_transport_connected(rd_kafka_transport_t *rktrans) {
+        // If the domain name is an FQDN, remove the trailing dot
+        char* dot = strrchr(rktrans->rktrans_rkb->rkb_nodename, '.');
+        if (dot != NULL && (dot[1] == ':' || dot[1] == '\0'))
+                memmove(dot, &dot[1], strlen(&dot[1]) + 1);
+
         rd_kafka_broker_t *rkb = rktrans->rktrans_rkb;
 
         rd_rkb_dbg(