diff --git a/init.el b/init.el
index 11b5590..1212535 100644
--- a/init.el
+++ b/init.el
@@ -113,9 +113,9 @@
 
   ;; Set fonts
   (add-to-list 'default-frame-alist '(font . "FiraCode Nerd Font Mono-12"))
-  (set-fontset-font "fontset-default"
-                    'japanese-jisx0208
-                    '("IPAGothic" . "iso10646-1"))
+  (add-hook 'server-after-make-frame-hook
+            (lambda ()
+              (set-fontset-font t 'japanese-jisx0208 "IPAGothic")))
 
   ;; Enable color in compilation buffers
   (add-hook 'compilation-filter-hook 'ansi-color-compilation-filter)
@@ -1433,7 +1433,6 @@ buffers `helpful--sym' to `my/helpful-symbol-history'."
   :config
   (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
 
-
 ;; modeline (doom-modeline)
 (use-package doom-modeline
   :init