1 files changed, 2 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 23685ee8ae6..a52a113ccda 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3457,7 +3457,8 @@ x_focus_changed (int type, int state, struct x_display_info *dpyinfo, struct fra
 
           /* Don't stop displaying the initial startup message
              for a switch-frame event we don't need.  */
-          if (NILP (Vterminal_frame)
+          /* When run as a deamon, Vterminal_frame is always NIL.  */
+          if ((NILP (Vterminal_frame) || EQ (Fdaemonp(), Qt))
               && CONSP (Vframe_list)
               && !NILP (XCDR (Vframe_list)))
             {