diff --git a/ext/drjit b/ext/drjit
index 9aa2d87a9..216d92179 160000
--- a/ext/drjit
+++ b/ext/drjit
@@ -1 +1 @@
-Subproject commit 9aa2d87a98be303368f991581ad5297782cba85a
+Subproject commit 216d921797f49ecad7e2bff44ac7cd6089b5cded
diff --git a/src/render/optixdenoiser.cpp b/src/render/optixdenoiser.cpp
index 014c0941f..fab891bb3 100644
--- a/src/render/optixdenoiser.cpp
+++ b/src/render/optixdenoiser.cpp
@@ -54,6 +54,7 @@ MI_VARIANT OptixDenoiser<Float, Spectrum>::OptixDenoiser(
 }
 
 MI_VARIANT OptixDenoiser<Float, Spectrum>::~OptixDenoiser() {
+    scoped_optix_context guard;
     if (m_denoiser != nullptr)
         jit_optix_check(optixDenoiserDestroy(m_denoiser));
     jit_free(m_hdr_intensity);
diff --git a/src/render/scene_optix.inl b/src/render/scene_optix.inl
index 6c68f3e76..0706da692 100644
--- a/src/render/scene_optix.inl
+++ b/src/render/scene_optix.inl
@@ -443,6 +443,7 @@ MI_VARIANT void Scene<Float, Spectrum>::accel_parameters_changed_gpu() {
         dr::sync_thread();
         OptixSceneState &s = *(OptixSceneState *) m_accel;
         const OptixConfig &config = optix_configs[s.config_index];
+        scoped_optix_context guard;
 
         if (!m_shapes.empty()) {
             // Build geometry acceleration structures for all the shapes