diff --git a/xpra/client/mixins/network_listener.py b/xpra/client/mixins/network_listener.py
index 5d43c96a67..47ca891293 100644
--- a/xpra/client/mixins/network_listener.py
+++ b/xpra/client/mixins/network_listener.py
@@ -51,7 +51,7 @@ def err(msg):
         if opts.bind and (not WIN32 or WIN32_LOCAL_SOCKETS or opts.bind!="auto"):
             try:
                 local_sockets = setup_local_sockets(opts.bind,
-                                                None, opts.client_socket_dirs,
+                                                None, opts.client_socket_dirs, None,
                                                 str(os.getpid()), True,
                                                 opts.mmap_group, opts.socket_permissions)
             except (OSError, InitExit) as e:
diff --git a/xpra/net/socket_util.py b/xpra/net/socket_util.py
index 172316d50d..c4bd9dc71f 100644
--- a/xpra/net/socket_util.py
+++ b/xpra/net/socket_util.py
@@ -513,14 +513,13 @@ def normalize_local_display_name(local_display_name):
     return local_display_name
 
 
-def setup_local_sockets(bind, socket_dir, socket_dirs, display_name, clobber,
+def setup_local_sockets(bind, socket_dir, socket_dirs, session_dir, display_name, clobber,
                         mmap_group="auto", socket_permissions="600", username="", uid=0, gid=0):
     log = get_network_logger()
-    log("setup_local_sockets%s", (bind, socket_dir, socket_dirs, display_name, clobber,
+    log("setup_local_sockets%s", (bind, socket_dir, socket_dirs, session_dir, display_name, clobber,
                                   mmap_group, socket_permissions, username, uid, gid))
     if not bind:
         return {}
-    session_dir = os.environ.get("XPRA_SESSION_DIR")
     if not socket_dir and (not socket_dirs or (len(socket_dirs)==1 and not socket_dirs[0])):
         if WIN32:
             socket_dirs = [""]
diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
index 77c3d196a6..697f5fdd7c 100755
--- a/xpra/scripts/main.py
+++ b/xpra/scripts/main.py
@@ -1505,7 +1505,7 @@ def handshake_complete(*_args):
             if "auto" in opts.bind:
                 opts.bind.remove("auto")
             local_sockets = setup_local_sockets(opts.bind,
-                                                opts.socket_dir, opts.socket_dirs,
+                                                opts.socket_dir, opts.socket_dirs, None,
                                                 None, False,
                                                 opts.mmap_group, opts.socket_permissions,
                                                 get_username(), getuid, getgid)
diff --git a/xpra/scripts/server.py b/xpra/scripts/server.py
index e6db1bd46f..cab91651ba 100644
--- a/xpra/scripts/server.py
+++ b/xpra/scripts/server.py
@@ -1398,7 +1398,7 @@ def init_local_sockets():
         #setup unix domain socket:
         netlog = get_network_logger()
         local_sockets = setup_local_sockets(opts.bind,
-                                            opts.socket_dir, opts.socket_dirs,
+                                            opts.socket_dir, opts.socket_dirs, session_dir,
                                             display_name, clobber,
                                             opts.mmap_group, opts.socket_permissions,
                                             username, uid, gid)