diff --git a/EESSI-extend-easybuild.eb b/EESSI-extend-easybuild.eb
index eaf59540..925e1841 100644
--- a/EESSI-extend-easybuild.eb
+++ b/EESSI-extend-easybuild.eb
@@ -216,7 +216,7 @@ eessi_version = os.getenv("EESSI_VERSION") or "2023.06"
 -- This avoids issues where EESSI-extend is first loaded with EB => 5.1 (which set these vars)
 -- but then EB is swapped for a version < 5.1 and then EESSI-extend is unloaded (which would not unset
 -- these vars if we did it conditional on the EB version)
-if convertToCanonical(easybuild_version) >= convertToCanonical("5.1") or mode() == "unload" then
+if mode() == "unload" or mode() == "dependencyCk" or convertToCanonical(easybuild_version) >= convertToCanonical("5.1") then
   setenv ("EASYBUILD_STRICT_RPATH_SANITY_CHECK", "1")
   setenv ("EASYBUILD_CUDA_SANITY_CHECK_ERROR_ON_FAILED_CHECKS", "1")
   setenv ("EASYBUILD_FAIL_ON_MOD_FILES_GCCCORE", "1")