diff --git a/modules/tools/direnv/config.el b/modules/tools/direnv/config.el
index f434f1b37..870041a84 100644
--- a/modules/tools/direnv/config.el
+++ b/modules/tools/direnv/config.el
@@ -1,7 +1,6 @@
 ;;; tools/direnv/config.el -*- lexical-binding: t; -*-
 
 (use-package! envrc
-  :when (executable-find "direnv")
   :hook (doom-first-file . envrc-global-mode)
   :config
   (add-to-list 'doom-debug-variables 'envrc-debug)
@@ -25,10 +24,9 @@
 
   (defadvice! +direnv--fail-gracefully-a (&rest _)
     "Don't try to use direnv if the executable isn't present."
-    :before-while #'envrc-mode
-    (or (get 'envrc-mode 'direnv-executable)
-        (put 'envrc-mode 'direnv-executable (executable-find "direnv" t))
-        (ignore (doom-log "Couldn't find direnv executable"))))
+    :before-while #'envrc-global-mode
+    (or (executable-find envrc-direnv-executable)
+        (ignore (doom-log "Failed to locate direnv executable; aborting envrc-global-mode"))))
 
   ;; Ensure babel's execution environment matches the host buffer's.
   (advice-add #'org-babel-execute-src-block :around #'envrc-propagate-environment)
diff --git a/modules/tools/direnv/packages.el b/modules/tools/direnv/packages.el
index 7c49bf25d..4f79e87f5 100644
--- a/modules/tools/direnv/packages.el
+++ b/modules/tools/direnv/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/direnv/packages.el
 
-(package! envrc :pin "7f36664fc6d97a7ca77c6c3e0c6577b72fa0b70d")
+(package! envrc :pin "1954e8c0b5c8440ea9852eeb7c046a677fa544f6")