diff --git a/src/filescanner_ffmpeg.c b/src/filescanner_ffmpeg.c
index c4bb086b..f38f7297 100644
--- a/src/filescanner_ffmpeg.c
+++ b/src/filescanner_ffmpeg.c
@@ -336,8 +336,11 @@ extract_metadata_icy(struct media_file_info *mfi, AVFormatContext *ctx)
   while (icy_token != NULL)
     {
       ptr = strchr(icy_token, ':');
-      if (!ptr || (strlen(ptr) < 3))
-	icy_token = strtok(NULL, "\r\n");
+      if (!ptr || (strlen(ptr) < 4))
+	{
+	  icy_token = strtok(NULL, "\r\n");
+	  continue;
+	}
 
       ptr++;
       if (ptr[0] == ' ')
diff --git a/src/filescanner_icy.c b/src/filescanner_icy.c
index 7a2fa88e..23507963 100644
--- a/src/filescanner_icy.c
+++ b/src/filescanner_icy.c
@@ -280,7 +280,6 @@ scan_metadata_icy(char *url, struct media_file_info *mfi)
 
   /* Can't count on server support for ICY metadata, so
    * while waiting for a reply make a parallel call to scan_metadata_ffmpeg.
-   * TODO ffmpeg 2/libav 10 has ICY/Shoutcast support
    */
  no_icy:
   ret = scan_metadata_ffmpeg(url, mfi);