diff --git a/daemon/media_socket.c b/daemon/media_socket.c
index 43ad7a538..663f94e55 100644
--- a/daemon/media_socket.c
+++ b/daemon/media_socket.c
@@ -2304,6 +2304,8 @@ static bool extmap_short_is_valid_data(unsigned int id, size_t len) {
 	// valid ranges for short form?
 	if (id <= 0 || id >= 15)
 		return false;
+	if (len == 0)
+		return false;
 	if (len > 16)
 		return false;
 	return true;