diff --git a/src/ctl/wfd.c b/src/ctl/wfd.c
index 651c52e2..319d3906 100644
--- a/src/ctl/wfd.c
+++ b/src/ctl/wfd.c
@@ -640,10 +640,7 @@ int wfd_audio_codecs_from_string(const char *l,
 			return r;
 		}
 
-		l += 16;
-		if(WFD_AUDIO_FORMAT_LPCM == c->caps[i].format) {
-			++ l;
-		}
+        l = strchr(l, ',') + 1;
 
 		free(f);
 		f = NULL;