diff --git a/playbook/startnet.cmd b/playbook/startnet.cmd
index 7a77356..18041b5 100644
--- a/playbook/startnet.cmd
+++ b/playbook/startnet.cmd
@@ -211,11 +211,17 @@ echo Asset tag: %MACHINENUM%
 :skip_machinenum
 
 REM --- Map enrollment share early (kept open for copy after imaging) ---
+REM Y: may already be mapped from :prompt_waxtrace_asset (picker block).
+REM net use of an already-mapped letter throws "System error 85: The local
+REM device name is already in use" which is harmless but noisy on screen.
+REM Skip the re-map when Y: is already mounted.
 set NEED_ENROLL=0
 if not "%PPKG%"=="" set NEED_ENROLL=1
 if not "%PCTYPE%"=="" set NEED_ENROLL=1
 if "%NEED_ENROLL%"=="0" goto enroll_staged
+if exist Y:\ goto enroll_already_mapped
 net use Y: \\172.16.9.1\enrollment /user:pxe-upload pxe /persistent:no
+:enroll_already_mapped
 if "%PPKG%"=="" goto enroll_staged
 if not exist "Y:\ppkgs\%SOURCE_PPKG%" (
     echo WARNING: %SOURCE_PPKG% not found on server. Enrollment will be skipped.