diff --git a/xpra/scripts/server.py b/xpra/scripts/server.py
index 25727d0e4d..8f575e8997 100644
--- a/xpra/scripts/server.py
+++ b/xpra/scripts/server.py
@@ -61,7 +61,6 @@
 from xpra.platform.dotxpra import DotXpra
 
 DESKTOP_GREETER = envbool("XPRA_DESKTOP_GREETER", True)
-CLEAN_SESSION_FILES = envbool("XPRA_CLEAN_SESSION_FILES", True)
 IBUS_DAEMON_COMMAND = os.environ.get("XPRA_IBUS_DAEMON_COMMAND",
                                      "ibus-daemon --xim --verbose --replace --panel=disable --desktop=xpra --daemonize")
 SHARED_XAUTHORITY = envbool("XPRA_SHARED_XAUTHORITY", True)
diff --git a/xpra/scripts/session.py b/xpra/scripts/session.py
index 31340b55cf..c0bbea0c82 100644
--- a/xpra/scripts/session.py
+++ b/xpra/scripts/session.py
@@ -7,10 +7,11 @@
 import glob
 
 from xpra.os_util import POSIX, getuid
-from xpra.scripts.server import CLEAN_SESSION_FILES
-from xpra.util.env import osexpand
+from xpra.util.env import osexpand, envbool
 from xpra.util.io import load_binary_file
 
+CLEAN_SESSION_FILES = envbool("XPRA_CLEAN_SESSION_FILES", True)
+
 
 def get_session_dir(mode: str, sessions_dir: str, display_name: str, uid: int) -> str:
     session_dir = osexpand(os.path.join(sessions_dir, display_name.lstrip(":")), uid=uid)