diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
index 03e1bca2be..4ada1d7fc3 100644
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -502,12 +502,16 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t *event
 		switch_core_session_t *session;
 		char *uuid = cmd + 8;
 
-
 		if (uuid) {
 			while(*uuid == ' ') {
 				uuid++;
 			}
-			strip_cr(uuid);
+
+			if (*uuid == '\r' || *uuid == '\n') {
+				uuid = NULL;
+			} else {
+				strip_cr(uuid);
+			}
 		}
 
 		if (!uuid) {