diff --git a/lisp/init-base.el b/lisp/init-base.el
index 9fbb2ba4e..f10f9707b 100644
--- a/lisp/init-base.el
+++ b/lisp/init-base.el
@@ -173,7 +173,7 @@
   (with-no-warnings
     (defun my-list-processes--prettify ()
       "Prettify process list."
-      (when-let ((entries tabulated-list-entries))
+      (when-let* ((entries tabulated-list-entries))
         (setq tabulated-list-entries nil)
         (dolist (p (process-list))
           (when-let* ((val (cadr (assoc p entries)))
diff --git a/lisp/init-edit.el b/lisp/init-edit.el
index d32190c4a..7fce42359 100644
--- a/lisp/init-edit.el
+++ b/lisp/init-edit.el
@@ -254,7 +254,7 @@
              (node-end (treesit-node-end node)))
         ;; Node fits the region exactly. Try its parent node instead.
         (when (and (= (region-beginning) node-start) (= (region-end) node-end))
-          (when-let ((node (treesit-node-parent node)))
+          (when-let* ((node (treesit-node-parent node)))
             (setq node-start (treesit-node-start node)
                   node-end (treesit-node-end node))))
         (set-mark node-end)
diff --git a/lisp/init-elisp.el b/lisp/init-elisp.el
index c85b439ad..26fb521a3 100644
--- a/lisp/init-elisp.el
+++ b/lisp/init-elisp.el
@@ -180,7 +180,7 @@ Lisp function does not specify a special indentation."
 
       (let ((orig-point (point)))
         (save-excursion
-          (when-let
+          (when-let*
               ((hook (progn (goto-char (point-min)) (symbol-at-point)))
                (func (when (and
                             (or (re-search-forward (format "^Value:?[\s|\n]") nil t)
diff --git a/lisp/init-funcs.el b/lisp/init-funcs.el
index b55453e7e..8dfdf3d71 100644
--- a/lisp/init-funcs.el
+++ b/lisp/init-funcs.el
@@ -504,7 +504,7 @@ This issue has been addressed in 28."
 
 (defun centaur--load-theme (theme)
   "Disable others and enable new THEME."
-  (when-let ((theme (centaur--theme-name theme)))
+  (when-let* ((theme (centaur--theme-name theme)))
     (mapc #'disable-theme custom-enabled-themes)
     (load-theme theme t)))
 
diff --git a/lisp/init-lsp.el b/lisp/init-lsp.el
index b803b5bd6..a974718dd 100644
--- a/lisp/init-lsp.el
+++ b/lisp/init-lsp.el
@@ -559,8 +559,8 @@
        ;; @see https://github.com/emacs-lsp/emacs-ccls/issues/109
        (cl-defmethod my-lsp-execute-command
          ((_server (eql ccls)) (command (eql ccls.xref)) arguments)
-         (when-let ((xrefs (lsp--locations-to-xref-items
-                            (lsp--send-execute-command (symbol-name command) arguments))))
+         (when-let* ((xrefs (lsp--locations-to-xref-items
+                             (lsp--send-execute-command (symbol-name command) arguments))))
            (xref--show-xrefs xrefs nil)))
        (advice-add #'lsp-execute-command :override #'my-lsp-execute-command)))
 
diff --git a/lisp/init-markdown.el b/lisp/init-markdown.el
index aa32f48cc..3efda90ad 100644
--- a/lisp/init-markdown.el
+++ b/lisp/init-markdown.el
@@ -141,8 +141,8 @@ mermaid.initialize({
   ;; mdopen doesn't need credentials, and only support external browsers
   (if (executable-find "mdopen")
       (setq grip-use-mdopen t)
-    (when-let ((credential (and (require 'auth-source nil t)
-                                (auth-source-user-and-password "api.github.com"))))
+    (when-let* ((credential (and (require 'auth-source nil t)
+                                 (auth-source-user-and-password "api.github.com"))))
       (setq grip-github-user (car credential)
             grip-github-password (cadr credential)))))
 
diff --git a/lisp/init-window.el b/lisp/init-window.el
index afb1983f0..a1b6f847b 100644
--- a/lisp/init-window.el
+++ b/lisp/init-window.el
@@ -241,8 +241,8 @@
       (when (and ;(called-interactively-p 'interactive)
              (not (region-active-p))
              popper-open-popup-alist)
-        (when-let ((window (caar popper-open-popup-alist))
-                   (buffer (cdar popper-open-popup-alist)))
+        (when-let* ((window (caar popper-open-popup-alist))
+                    (buffer (cdar popper-open-popup-alist)))
           (when (and (with-current-buffer buffer
                        (not (derived-mode-p 'eshell-mode
                                             'shell-mode