diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c
index 054372a..b4bb878 100644
--- a/src/gsm/gsm0808_utils.c
+++ b/src/gsm/gsm0808_utils.c
@@ -200,11 +200,10 @@
 
 	header = *elem;
 
-	/* Malformed elements */
+	/* An extended codec type needs at least two fields,
+	 * bail if the input data length is not sufficient. */
 	if ((header & 0x0F) == 0x0F && len < 2)
 		return -EINVAL;
-	else if ((header & 0x0F) != 0x0F && len < 1)
-		return -EINVAL;
 
 	elem++;
 	len--;