diff --git a/system/etc.nix b/system/etc.nix
index c4f69ffd76d8..4f94b904ecd0 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -7,6 +7,7 @@ let
 
   envConf = pkgs.writeText "environment" "
     PATH=${systemPath}/bin:${systemPath}/sbin:${pkgs.openssh}/bin
+    NIX_REMOTE=daemon
   " /* ${pkgs.openssh}/bin is a hack to get remote scp to work */; 
 
 in
diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index b858f9e74b0d..ae29c857294c 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -13,6 +13,8 @@ fi
 
 if test "$USER" != root; then
     export NIX_REMOTE=daemon
+else
+    export NIX_REMOTE=
 fi