diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index e8bc9ca2d0..dcecd103a3 100644
--- a/Base/etc/SystemServer.ini
+++ b/Base/etc/SystemServer.ini
@@ -5,6 +5,7 @@ StdIO=/dev/tty1
 Priority=high
 
 [ProtocolServer]
+Socket=/tmp/portal/protocol
 Priority=low
 KeepAlive=1
 User=anon
diff --git a/Libraries/LibProtocol/Client.cpp b/Libraries/LibProtocol/Client.cpp
index baeb14e9ce..cb53ec916e 100644
--- a/Libraries/LibProtocol/Client.cpp
+++ b/Libraries/LibProtocol/Client.cpp
@@ -5,7 +5,7 @@
 namespace LibProtocol {
 
 Client::Client()
-    : ConnectionNG(*this, "/tmp/psportal")
+    : ConnectionNG(*this, "/tmp/portal/protocol")
 {
     handshake();
 }
diff --git a/Servers/ProtocolServer/main.cpp b/Servers/ProtocolServer/main.cpp
index 568509384b..8937aa1578 100644
--- a/Servers/ProtocolServer/main.cpp
+++ b/Servers/ProtocolServer/main.cpp
@@ -9,8 +9,8 @@ int main(int, char**)
     CEventLoop event_loop;
     (void)*new HttpProtocol;
     auto server = CLocalServer::construct();
-    unlink("/tmp/psportal");
-    server->listen("/tmp/psportal");
+    bool ok = server->take_over_from_system_server();
+    ASSERT(ok);
     server->on_ready_to_accept = [&] {
         auto client_socket = server->accept();
         if (!client_socket) {