diff --git a/6-RShell/starter/rsh_cli.c b/6-RShell/starter/rsh_cli.c
index be4541a90bb920b1226800bdb5f944a68fadc0f4..67f5571083803c66dc41a4f602f84609ebfff2fa 100644
--- a/6-RShell/starter/rsh_cli.c
+++ b/6-RShell/starter/rsh_cli.c
@@ -119,6 +119,10 @@ int exec_remote_cmd_loop(char *address, int port)
             break;
         }
         cmd_buff[strcspn(cmd_buff,"\n")] = '\0';
+
+        if (cmd_buff[0] == '\0'){
+            continue;
+        }
         // TODO send() over cli_socket
 
         int ret = send(cli_socket, cmd_buff, strlen(cmd_buff) + 1, 0);
diff --git a/6-RShell/starter/rsh_server.c b/6-RShell/starter/rsh_server.c
index b0d9ac169f98bb3475c2342ec791ca52a10e7208..b5bde8ff352681c9c9155d54640f5ad1ac2a4195 100644
--- a/6-RShell/starter/rsh_server.c
+++ b/6-RShell/starter/rsh_server.c
@@ -133,11 +133,6 @@ int boot_server(char *ifaces, int port){
     addr.sin_family = AF_INET;
     inet_pton(AF_INET, ifaces, &addr.sin_addr.s_addr);
     addr.sin_port = htons(port);
-    /*
-     * Prepare for accepting connections. The backlog size is set
-     * to 20. So while one request is being processed other requests
-     * can be waiting.
-     */
 
     ret = bind(svr_socket, (const struct sockaddr *) &addr,
         sizeof(struct sockaddr_in));