diff --git a/racket/src/expander/namespace/variable-reference.rkt b/racket/src/expander/namespace/variable-reference.rkt
index b4fa97d60b..0b736929f8 100644
--- a/racket/src/expander/namespace/variable-reference.rkt
+++ b/racket/src/expander/namespace/variable-reference.rkt
@@ -29,7 +29,8 @@
   (define mpi (namespace-mpi ns))
   (when (non-self-module-path-index? mpi)
     ;; Ensure that the module is available
-    (namespace-module-make-available! ns mpi (namespace-0-phase ns)))
+    (parameterize ([current-namespace ns])
+      (namespace-module-make-available! ns mpi (namespace-0-phase ns))))
   ns)
 
 (define (variable-reference->namespace* vr)
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index c68467e81e..bf5650094a 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -57814,8 +57814,15 @@ static const char *startup_source =
 "(begin"
 "(if(non-self-module-path-index? mpi_50)"
 "(let-values()"
+"(with-continuation-mark"
+" parameterization-key"
+"(extend-parameterization"
+"(continuation-mark-set-first #f parameterization-key)"
+" 1/current-namespace"
+" ns_60)"
+"(let-values()"
 "(let-values(((ns4_1) ns_60)((mpi5_0) mpi_50)((temp6_5)(namespace-0-phase ns_60)))"
-"(namespace-module-make-available!112.1 unsafe-undefined ns4_1 mpi5_0 temp6_5)))"
+"(namespace-module-make-available!112.1 unsafe-undefined ns4_1 mpi5_0 temp6_5)))))"
 "(void))"
 " ns_60)))))))))"
 "(define-values"