diff --git a/components/tvshows/TVListDetails.bs b/components/tvshows/TVListDetails.bs
index 986c73f25..7e30f557b 100644
--- a/components/tvshows/TVListDetails.bs
+++ b/components/tvshows/TVListDetails.bs
@@ -1,5 +1,5 @@
-import "pkg:/source/utils/misc.bs"
 import "pkg:/source/utils/config.bs"
+import "pkg:/source/utils/misc.bs"
 
 sub init()
     m.title = m.top.findNode("title")
@@ -104,8 +104,13 @@ sub itemContentChanged()
     m.videoCodec.visible = false
     if isValid(itemData.MediaSources)
         for i = 0 to itemData.MediaSources.Count() - 1
-            if item.selectedVideoStreamId = itemData.MediaSources[i].id and isValid(itemData.MediaSources[i].MediaStreams[0])
-                m.videoCodec.text = tr("Video") + ": " + itemData.MediaSources[i].MediaStreams[0].DisplayTitle
+            if item.selectedVideoStreamId = itemData.MediaSources[i].id and isValidAndNotEmpty(itemData.MediaSources[i].MediaStreams)
+                for j = 0 to itemData.MediaSources[i].MediaStreams.Count() - 1
+                    if LCase(itemData.MediaSources[i].MediaStreams[j].type) = "video"
+                        m.videoCodec.text = tr("Video") + ": " + itemData.MediaSources[i].MediaStreams[j].DisplayTitle
+                        exit for
+                    end if
+                end for
                 SetupAudioDisplay(itemData.MediaSources[i].MediaStreams, item.selectedAudioStreamIndex)
                 exit for
             end if
diff --git a/source/static/whatsNew/1.0.6.json b/source/static/whatsNew/1.0.6.json
index 03ee1b7b4..21b64afb5 100644
--- a/source/static/whatsNew/1.0.6.json
+++ b/source/static/whatsNew/1.0.6.json
@@ -10,5 +10,9 @@
   {
     "description": "Fix music genre library view",
     "author": "1hitsong"
+  },
+  {
+    "description": "Fix episode list vVideo codec display when video is not media stream 0",
+    "author": "1hitsong"
   }
 ]
\ No newline at end of file