diff --git a/lisp/doom-start.el b/lisp/doom-start.el
index ec77e1d4d..c38a7ebfb 100644
--- a/lisp/doom-start.el
+++ b/lisp/doom-start.el
@@ -70,7 +70,7 @@
 ;; default 0.1 should make childframes and packages that manipulate them (like
 ;; `lsp-ui', `company-box', and `posframe') feel much snappier. See
 ;; emacs-lsp/lsp-ui#613.
-(eval-when! (boundp 'pgtk-wait-for-event-timeout)
+(when (boundp 'pgtk-wait-for-event-timeout)
   (setq pgtk-wait-for-event-timeout 0.001))
 
 ;; Increase how much is read from processes in a single chunk (default is 4kb).
@@ -83,7 +83,7 @@
 
 ;; Performance on Windows is considerably worse than elsewhere. We'll need
 ;; everything we can get.
-(eval-when! (boundp 'w32-get-true-file-attributes)
+(when (boundp 'w32-get-true-file-attributes)
   (setq w32-get-true-file-attributes nil    ; decrease file IO workload
         w32-pipe-read-delay 0               ; faster IPC
         w32-pipe-buffer-size (* 64 1024)))  ; read more at a time (was 4K)
diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el
index 75beb8645..11b5082dc 100644
--- a/modules/lang/ocaml/config.el
+++ b/modules/lang/ocaml/config.el
@@ -132,5 +132,5 @@
   (opam-switch-set-switch (tuareg-opam-current-compiler)))
 
 
-(eval-when! (modulep! +tree-sitter)
+(when (modulep! +tree-sitter)
   (add-hook 'tuareg-mode-local-vars-hook #'tree-sitter!))