diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el
index 08b352d97..56689b626 100644
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@@ -3,37 +3,38 @@
 ;; Show more information in ivy-switch-buffer; and only display
 ;; workgroup-relevant buffers.
 (defun +ivy--get-buffers (&optional buffer-list)
-  (let* ((buffer-list (or buffer-list (doom-buffer-list)))
-         (min-name
-          (+ 5 (cl-loop for buf in buffer-list
-                        maximize (length (buffer-name buf)))))
-         (min-mode
-          (+ 5 (cl-loop for buf in buffer-list
-                        maximize (length (symbol-name (buffer-local-value 'major-mode buf)))))))
-    (cl-loop
-     with project-root = (doom-project-root)
-     for buf in buffer-list
-     collect
-     (destructuring-bind (type mode path)
-         (with-current-buffer buf
-           (list (concat
-                  (let ((buffer-name (buffer-name buf)))
-                    (propertize
-                     buffer-name
-                     'face (cond ((string-match-p "^ ?\\*" buffer-name)
-                                  'font-lock-comment-face)
-                                 ((not (string= project-root (doom-project-root)))
-                                  'warning)
-                                 (buffer-read-only
-                                  'error))))
-                  (when (and buffer-file-name (buffer-modified-p))
-                    (propertize "[+]" 'face 'doom-modeline-buffer-modified)))
-                 (propertize (symbol-name major-mode) 'face 'font-lock-constant-face)
-                 (when buffer-file-name
-                   (abbreviate-file-name
-                    (file-name-directory buffer-file-name)))))
-       (format (format "%%-%ds %%-%ds %%s" min-name min-mode)
-               type mode (or path ""))))))
+  (when-let (buffer-list (or buffer-list (doom-buffer-list)))
+    (let* ((buffer-list (or buffer-list (doom-buffer-list)))
+           (min-name
+            (+ 5 (cl-loop for buf in buffer-list
+                          maximize (length (buffer-name buf)))))
+           (min-mode
+            (+ 5 (cl-loop for buf in buffer-list
+                          maximize (length (symbol-name (buffer-local-value 'major-mode buf)))))))
+      (cl-loop
+       with project-root = (doom-project-root)
+       for buf in buffer-list
+       collect
+       (destructuring-bind (type mode path)
+           (with-current-buffer buf
+             (list (concat
+                    (let ((buffer-name (buffer-name buf)))
+                      (propertize
+                       buffer-name
+                       'face (cond ((string-match-p "^ ?\\*" buffer-name)
+                                    'font-lock-comment-face)
+                                   ((not (string= project-root (doom-project-root)))
+                                    'warning)
+                                   (buffer-read-only
+                                    'error))))
+                    (when (and buffer-file-name (buffer-modified-p))
+                      (propertize "[+]" 'face 'doom-modeline-buffer-modified)))
+                   (propertize (symbol-name major-mode) 'face 'font-lock-constant-face)
+                   (when buffer-file-name
+                     (abbreviate-file-name
+                      (file-name-directory buffer-file-name)))))
+         (format (format "%%-%ds %%-%ds %%s" min-name min-mode)
+                 type mode (or path "")))))))
 
 (defun +ivy--select-buffer-action (buffer)
   (ivy--switch-buffer-action