diff --git a/core/core-ui.el b/core/core-ui.el
index 9b2d00144..538947633 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -37,8 +37,8 @@ shorter major mode name in the mode-line. See `doom|set-mode-name'.")
 with `doom//reload-theme').")
 
 ;; Prevents the unstyled mode-line flash at startup
-(with-current-buffer (switch-to-buffer "*scratch*")
-  (setq mode-line-format nil))
+(set-buffer "*scratch*")
+(setq mode-line-format nil)
 
 (setq-default
  bidi-display-reordering nil ; disable bidirectional text for tiny performance boost