diff --git a/lib/system-detect.sh b/lib/system-detect.sh
index 4f4d15a..5cc7f13 100755
--- a/lib/system-detect.sh
+++ b/lib/system-detect.sh
@@ -12,16 +12,18 @@ if [ -z "$TOOLKIT_BASE_DIR" ]; then
     source "$SCRIPT_DIR/common-functions.sh"
 fi
 
-# Global variables (session-only)
-export SYS_CONTROL_PANEL=""
-export SYS_CONTROL_PANEL_VERSION=""
-export SYS_OS_TYPE=""
-export SYS_OS_VERSION=""
-export SYS_WEB_SERVER=""
-export SYS_WEB_SERVER_VERSION=""
-export SYS_DB_TYPE=""
-export SYS_DB_VERSION=""
-export SYS_LOG_DIR=""
+# Global variables (session-only) - only initialize if not already set
+if [ -z "$SYS_DETECTION_COMPLETE" ]; then
+    export SYS_CONTROL_PANEL=""
+    export SYS_CONTROL_PANEL_VERSION=""
+    export SYS_OS_TYPE=""
+    export SYS_OS_VERSION=""
+    export SYS_WEB_SERVER=""
+    export SYS_WEB_SERVER_VERSION=""
+    export SYS_DB_TYPE=""
+    export SYS_DB_VERSION=""
+    export SYS_LOG_DIR=""
+fi
 export SYS_USER_HOME_BASE=""
 export SYS_PHP_VERSIONS=()
 export SYS_CLOUDFLARE_ACTIVE=""