diff --git a/lib/core.ps1 b/lib/core.ps1
index a88a7d4d..2b7b9a18 100644
--- a/lib/core.ps1
+++ b/lib/core.ps1
@@ -89,7 +89,7 @@ function shim($path, $global) {
 	# note: use > for first line to replace file, then >> to append following lines
 	echo '# ensure $HOME is set for MSYS programs' > $shim
 	echo "if(!`$env:home) { `$env:home = `"`$home\`" }" >> $shim
-	echo 'if($env:home -eq "\") { $env:home = $null } # running as system' >> $shim
+	echo 'if($env:home -eq "\") { $env:home = $env:allusersprofile }' >> $shim
 	echo "`$path = '$path'" >> $shim
 	echo 'if($myinvocation.expectingInput) { $input | & $path @args } else { & $path @args }' >> $shim