diff --git a/README.org b/README.org
index 4ca37b48..fe4aa3bc 100644
--- a/README.org
+++ b/README.org
@@ -93,7 +93,7 @@ In order to have this config work on both my desktop with regular joe-schmoe mon
                       :height chris/default-font-size :weight 'regular))
 
 (if (daemonp)
-    (add-hook 'after-make-frame-functions
+    (add-hook 'server-after-make-frame-functions
 	      (lambda (frame)
 		(with-selected-frame frame
 		  (chris/set-font-faces))))
@@ -161,7 +161,7 @@ Let's also turn on =recentf-mode=.
         doom-modeline-bar-width 3
         all-the-icons-scale-factor 0.9)
   (if (daemonp)
-      (add-hook 'after-make-frame-functions
+      (add-hook 'server-after-make-frame-functions
 		(lambda (frame)
 		  (with-selected-frame frame
 		    (setq doom-modeline-icon t))))))
diff --git a/init.el b/init.el
index 2cfc4e9b..f60e274f 100644
--- a/init.el
+++ b/init.el
@@ -33,7 +33,7 @@
                       :height chris/default-font-size :weight 'regular))
 
 (if (daemonp)
-    (add-hook 'after-make-frame-functions
+    (add-hook 'server-after-make-frame-functions
 	      (lambda (frame)
 		(with-selected-frame frame
 		  (chris/set-font-faces))))
@@ -81,7 +81,7 @@
         doom-modeline-bar-width 3
         all-the-icons-scale-factor 0.9)
   (if (daemonp)
-      (add-hook 'after-make-frame-functions
+      (add-hook 'server-after-make-frame-functions
 		(lambda (frame)
 		  (with-selected-frame frame
 		    (setq doom-modeline-icon t))))))