diff --git a/src/server.c b/src/server.c
index 6143e7a..a1ada9c 100644
--- a/src/server.c
+++ b/src/server.c
@@ -622,7 +622,7 @@ void *Dispatcher(void *arg) {
                     cmd_send_message(SERVER_ID, sender_id, error_message);
                     break;
                 }
-                if ((receiver_id < 0) || ((receiver_id == 0) && (endptr == token))) {
+                if (receiver_id < 0) {
                     fprintf(stderr, "Invalid receiver ID \"%s\"\n", token);
                     break;
                 }