diff --git a/src/net/client_factory.cpp b/src/net/client_factory.cpp
index 739e2ef7c991efa589458cd642aacb63f2d72d7d..472404f43557239265cf406bfb3361a3e89d413f 100644
--- a/src/net/client_factory.cpp
+++ b/src/net/client_factory.cpp
@@ -71,13 +71,21 @@ namespace rmrf::net {
         return client_factory_construct_stream_client(socket_identifier, cb);
     }
 
+    [[nodiscard]] std::unique_ptr<connection_client> client_factory_construct_unix_client(const socketaddr& socket_identifier, connection_client::incomming_data_cb cb) {
+        if (socket_identifier.family() != AF_UNIX) {
+            throw netio_exception("Expected UNIX domain socket address as target");
+        }
+
+        return client_factory_construct_stream_client(socket_identifier, cb);
+    }
+
     [[nodiscard]] std::unique_ptr<connection_client> client_factory_construct_stream_client(const socketaddr& socket_identifier, connection_client::incomming_data_cb cb) {
         auto_fd socket_candidate{socket(socket_identifier.family(), SOCK_STREAM, 0)};
 
         if (socket_candidate.valid()) {
             if (connect(socket_candidate.get(), socket_identifier.ptr(), socket_identifier.size()) == 0) {
                 make_socket_nonblocking(socket_candidate);
-                const auto own_address = get_own_address_after_connect(socket_candidate);
+                const auto own_address = socket_identifier.family() != AF_UNIX ? get_own_address_after_connect(socket_candidate) : socketaddr{};
 
                 // TODO create client object using socket_candidate, own_address and socket_identifier as remote address
                 auto c = std::make_unique<tcp_client>(nullptr, std::move(socket_candidate), own_address, socket_identifier);
@@ -94,11 +102,10 @@ namespace rmrf::net {
         switch(type) {
             case socket_t::TCP:
                 return client_factory_construct_tcp_client(address);
+            case socket_t::UNIX:
+                return client_factory_construct_unix_client(address);
             case socket_t::UDP:
                 return client_factory_construct_udp_client(address);
-            case socket_t::UNIX:
-                // TODO implement
-                return nullptr;
             default:
                 return nullptr;
         }
diff --git a/src/net/client_factory.hpp b/src/net/client_factory.hpp
index 1322073994fe9aaaffa091b650ff13d3f47fe291..bd86c9a07b0d34ce4513df3b1dc5438488ec1a1e 100644
--- a/src/net/client_factory.hpp
+++ b/src/net/client_factory.hpp
@@ -11,6 +11,7 @@ namespace rmrf::net {
     
     [[nodiscard]] std::unique_ptr<udp_client> client_factory_construct_udp_client(const socketaddr& socket_identifier, connection_client::incomming_data_cb cb = nullptr);
     [[nodiscard]] std::unique_ptr<connection_client> client_factory_construct_tcp_client(const socketaddr& socket_identifier, connection_client::incomming_data_cb cb = nullptr);
+    [[nodiscard]] std::unique_ptr<connection_client> client_factory_construct_unix_client(const socketaddr& socket_identifier, connection_client::incomming_data_cb cb = nullptr);
     [[nodiscard]] std::unique_ptr<connection_client> client_factory_construct_stream_client(const socketaddr& socket_identifier, connection_client::incomming_data_cb cb = nullptr);
     
     /**