diff --git a/lldb/source/Commands/CommandObjectProtocolServer.cpp b/lldb/source/Commands/CommandObjectProtocolServer.cpp
index 55bd42ed1a533..f11e27f01c8a8 100644
--- a/lldb/source/Commands/CommandObjectProtocolServer.cpp
+++ b/lldb/source/Commands/CommandObjectProtocolServer.cpp
@@ -75,9 +75,12 @@ class CommandObjectProtocolServerStart : public CommandObjectParsed {
 
     ProtocolServer::Connection connection;
     connection.protocol = protocol_and_mode->first;
-    connection.name =
-        formatv("[{0}]:{1}", uri->hostname.empty() ? "0.0.0.0" : uri->hostname,
-                uri->port.value_or(0));
+    if (connection.protocol == Socket::SocketProtocol::ProtocolUnixDomain)
+      connection.name = uri->path;
+    else
+      connection.name = formatv(
+          "[{0}]:{1}", uri->hostname.empty() ? "0.0.0.0" : uri->hostname,
+          uri->port.value_or(0));
 
     if (llvm::Error error = server->Start(connection)) {
       result.AppendErrorWithFormatv("{0}", llvm::fmt_consume(std::move(error)));
@@ -90,6 +93,7 @@ class CommandObjectProtocolServerStart : public CommandObjectParsed {
       result.AppendMessageWithFormatv(
           "{0} server started with connection listeners: {1}", protocol,
           address);
+      result.SetStatus(eReturnStatusSuccessFinishNoResult);
     }
   }
 };
diff --git a/lldb/test/API/commands/protocol/TestMCPUnixSocket.py b/lldb/test/API/commands/protocol/TestMCPUnixSocket.py
new file mode 100644
index 0000000000000..de0aec040695f
--- /dev/null
+++ b/lldb/test/API/commands/protocol/TestMCPUnixSocket.py
@@ -0,0 +1,33 @@
+import os
+import tempfile
+import unittest
+
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+
+# To be safe and portable, Unix domain socket paths should be kept at or below
+# 108 characters on Linux, and around 104 characters on macOS:
+MAX_SOCKET_PATH_LENGTH = 104
+
+
+class MCPUnixSocketCommandTestCase(TestBase):
+    @skipIfWindows
+    @no_debug_info_test
+    def test_unix_socket(self):
+        """
+        Test if we can start an MCP protocol-server accepting unix sockets
+        """
+
+        temp_directory = tempfile.TemporaryDirectory()
+        socket_file = os.path.join(temp_directory.name, "mcp.sock")
+
+        if len(socket_file) >= MAX_SOCKET_PATH_LENGTH:
+            self.skipTest(
+                f"Socket path {socket_file} exceeds the {MAX_SOCKET_PATH_LENGTH} character limit"
+            )
+
+        self.expect(
+            f"protocol-server start MCP accept://{socket_file}",
+            startstr="MCP server started with connection listeners:",
+            substrs=[f"unix-connect://{socket_file}"],
+        )