diff --git a/src/mqtt.c b/src/mqtt.c
index 8a6b6a0..6624201 100644
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -291,7 +291,7 @@
 	uint16_t len = 0;
 
 	/* read and compute the string length */
-	if (istlen(parser) <= 2)
+	if (istlen(parser) < 2)
 		goto error;
 
 	parser = mqtt_read_2byte_int(parser, &len);
@@ -862,7 +862,7 @@
 	 */
 	/* read client identifier */
 	parser = mqtt_read_string(parser, &mpkt->data.connect.payload.client_identifier);
-	if (!isttest(parser) || !istlen(mpkt->data.connect.payload.client_identifier))
+	if (!isttest(parser))
 		goto end;
 
 	/* read Will Properties, for MQTT v5 only