diff --git a/lldb/tools/lldb-server/lldb-platform.cpp b/lldb/tools/lldb-server/lldb-platform.cpp
index d1f925685dff9..2ef780578d0a2 100644
--- a/lldb/tools/lldb-server/lldb-platform.cpp
+++ b/lldb/tools/lldb-server/lldb-platform.cpp
@@ -142,8 +142,8 @@ static Status parse_listen_host_port(Socket::SocketProtocol &protocol,
       return Status::FromErrorStringWithFormat(
           "The same platform and gdb ports %u.", platform_port);
     }
-    address = llvm::formatv("{0}:{1}", hostname, platform_port).str();
-    gdb_address = llvm::formatv("{0}:{1}", hostname, gdbserver_port).str();
+    address = llvm::formatv("[{0}]:{1}", hostname, platform_port).str();
+    gdb_address = llvm::formatv("[{0}]:{1}", hostname, gdbserver_port).str();
   } else {
     if (gdbserver_port) {
       return Status::FromErrorStringWithFormat(