diff --git a/client/client.c b/client/client.c
index a9d0096d..b938f344 100644
--- a/client/client.c
+++ b/client/client.c
@@ -137,6 +137,21 @@ submit_server_command(char *cmd)
   server_send(cmd);
 }
 
+static inline void
+submit_init_command(char *cmd_raw)
+{
+  char *cmd = cmd_expand(cmd_raw);
+
+  if (!cmd)
+  {
+    cleanup();
+    exit(0);
+  }
+
+  submit_server_command(cmd);
+  free(cmd);
+}
+
 void
 submit_command(char *cmd_raw)
 {
@@ -165,7 +180,7 @@ init_commands(void)
     {
       /* First transition - client received hello from BIRD
 	 and there is waiting initial command */
-      submit_server_command(init_cmd);
+      submit_init_command(init_cmd);
       init_cmd = NULL;
       return;
     }