diff --git a/emacs/emacs.el b/emacs/emacs.el
index ac5ddc3..db2c836 100644
--- a/emacs/emacs.el
+++ b/emacs/emacs.el
@@ -161,6 +161,11 @@
 ;; set font
 (set-frame-font "Fira Code 8" nil t)
 
+;; set the default font after the frame is created.
+;; needed because of some issue with emacsclient.
+(add-hook 'after-make-frame-functions
+	  (lambda (frame) (set-frame-font "Fira Code 8" nil t)))
+
 ;; -----------------------------------------------------------------------------
 
 ;; Custom keybindings