diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c4dbae5713..3bef2ccb7cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -193,7 +193,10 @@ let
           stdenv = stdenvCross;
           overrideSetup = overrideSetup;
         }
-      else stdenvCross;
+      else if crossSystem != null then
+        stdenvCross
+      else
+        defaultStdenv;
 
   forceBuildDrv = drv : drv // { hostDrv = drv.buildDrv; };