diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index e5b651fab..43bc215bb 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -118,18 +118,18 @@ Respects `diff-hl-disable-on-remote'."
   (add-hook! '(doom-escape-hook doom-switch-window-hook doom-switch-frame-hook) :append
     (defun +vc-gutter-update-h (&rest _)
       "Return nil to prevent shadowing other `doom-escape-hook' hooks."
-      (and (or (bound-and-true-p diff-hl-mode)
-               (bound-and-true-p diff-hl-dir-mode))
-           (buffer-file-name (buffer-base-buffer))
-           (not ; debouncing
-            (equal (cons (point) +vc-gutter--last-state)
-                   (setq +vc-gutter--last-state
-                         (cons (point)
-                               (copy-sequence
-                                (symbol-plist
-                                 (intern (expand-file-name buffer-file-name)
-                                         vc-file-prop-obarray)))))))
-           (ignore (diff-hl-update)))))
+      (when-let* (((or (bound-and-true-p diff-hl-mode)
+                       (bound-and-true-p diff-hl-dir-mode)))
+                  (file (buffer-file-name (buffer-base-buffer)))
+                  ((not ; debouncing
+                    (equal (cons (point) +vc-gutter--last-state)
+                           (setq +vc-gutter--last-state
+                                 (cons (point)
+                                       (copy-sequence
+                                        (symbol-plist
+                                         (intern (expand-file-name file)
+                                                 vc-file-prop-obarray)))))))))
+        (ignore (diff-hl-update)))))
   ;; UX: Update diff-hl when magit alters git state.
   (when (modulep! :tools magit)
     (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh))