diff --git a/src/main/lkt.c b/src/main/lkt.c
index 7df05c9888ab45605b93ea7c1f85e1ce0730d26d..89ba0e4556dbfb1914a6ea01054a27febc20d0c8 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -175,12 +175,12 @@ send_cmd_with_uri(FILE *sock, char *cmd, int argc, const char **argv)
         fail_if(args->argc, "This command takes no arguments");         \
         lkt_send_and_exit(msg, sizeof(msg));                            \
     }
-just_send(queue_clear__, "clear\nclose\n")
-just_send(queue_crop__,  "crop\nclose\n")
-just_send(next__,        "next\nclose\n")
-just_send(prev__,        "previous\nclose\n")
-just_send(stop__,        "stop\nclose\n")
-just_send(shuffle__,     "shuffle\nplay\nclose\n")
+just_send(queue_clear__, "clear\n")
+just_send(queue_crop__,  "crop\n")
+just_send(next__,        "next\n")
+just_send(prev__,        "previous\n")
+just_send(stop__,        "stop\n")
+just_send(shuffle__,     "shuffle\nplay\n")
 #undef just_send
 
 noreturn void
@@ -188,7 +188,7 @@ simple_send_with_password__(const char *cmd)
 {
     if (!password)
         fail("Password not provided");
-    static const char cmd__[] = "password %s\n%s\nclose\n";
+    static const char cmd__[] = "password %s\n%s\n";
     FILE *sock = lkt_connect();
     write_socket(sock, cmd__, password, cmd);
     exit(EXIT_SUCCESS);
@@ -257,9 +257,9 @@ play__(struct lkt_cmd_args *args)
         pos = atoi(args->argv[0]);
 
     static const char status__[]        = "status\n";
-    static const char cmd_play__[]      = "play\nclose\n";
-    static const char cmd_play_from__[] = "play %d\nclose\n";
-    static const char cmd_pause__[]     = "pause\nclose\n";
+    static const char cmd_play__[]      = "play\n";
+    static const char cmd_play_from__[] = "play %d\n";
+    static const char cmd_pause__[]     = "pause\n";
 
     char buff[LKT_MESSAGE_MAX];
     FILE *sock = lkt_connect();
@@ -297,11 +297,11 @@ ping__(struct lkt_cmd_args *args)
         fail("Invalid argument, the ping command takes no arguments");
     char buff[6] = {0};
     FILE *sock = lkt_connect();
-    write_socket(sock, "ping\nclose\n");
+    write_socket(sock, "ping\n");
     read_socket(sock, buff, 6 * sizeof(char));
     if (!STR_NMATCH(buff, "OK", 2))
         fail("ACK");
-    exit(write(1, "OK\n", sizeof("OK\n")) > 0);
+    exit(write(1, "OK\n", sizeof("OK\n")) == 0);
 }
 
 noreturn void
@@ -485,7 +485,7 @@ queue_delete__(struct lkt_cmd_args *args)
     if (args->argc != 1)
         fail("Invalid argument, need onlt one argument: queue delete <id>");
 
-    static const char *cmd_id__ = "deleteid %d\nclose\n";
+    static const char *cmd_id__ = "deleteid %d\n";
     int dumy = 0;
     FILE *sock = lkt_connect();
     char buff[3];
diff --git a/src/main/lktadm.c b/src/main/lktadm.c
index 009d93d6114d08fdbc84ff663dcc28edbd12bafe..1a5e561d1e0c905750b8570d20e5a24751e0b11c 100644
--- a/src/main/lktadm.c
+++ b/src/main/lktadm.c
@@ -25,7 +25,7 @@ fail(const char *format, ...)
     va_start(ap, format);
     vfprintf(stderr, format, ap);
     va_end(ap);
-    exit(write(2, "\n", 1) > 0);
+    exit(write(2, "\n", 1) == 0);
 }
 
 /* ----------------- *