diff --git a/components/movies/MovieDetails.brs b/components/movies/MovieDetails.brs
index 8c38706b..82ff12d4 100644
--- a/components/movies/MovieDetails.brs
+++ b/components/movies/MovieDetails.brs
@@ -101,7 +101,15 @@ sub SetUpVideoOptions(streams)
 
     for i = 0 to streams.Count() - 1
         if streams[i].VideoType = "VideoFile"
-            videos.push({ "Title": streams[i].Name, "Description": tr("Video"), "Selected": m.top.selectedVideoStreamId = streams[i].id, "StreamID": streams[i].id, "video_codec": streams[i].mediaStreams[0].displayTitle })
+            codec = ""
+            if streams[i].mediaStreams <> invalid and streams[i].mediaStreams.Count() > 0 then codec = streams[i].mediaStreams[0].displayTitle
+            videos.push({ 
+                "Title": streams[i].Name, 
+                "Description": tr("Video"), 
+                "Selected": m.top.selectedVideoStreamId = streams[i].id, 
+                "StreamID": streams[i].id, 
+                "video_codec": codec
+            })
         end if
     end for
 
diff --git a/components/tvshows/TVListDetails.brs b/components/tvshows/TVListDetails.brs
index 2ddaab21..3e1dce74 100644
--- a/components/tvshows/TVListDetails.brs
+++ b/components/tvshows/TVListDetails.brs
@@ -27,25 +27,23 @@ sub itemContentChanged()
         m.top.findNode("star").visible = false
     end if
 
+    videoIdx = invalid
+    audioIdx = invalid
     if itemData.MediaStreams <> invalid
-        videoIdx = invalid
-        audioIdx = invalid
         for i = 0 to itemData.MediaStreams.Count() - 1
             if itemData.MediaStreams[i].Type = "Video" and videoIdx = invalid
                 videoIdx = i
+                m.top.findNode("video_codec").text = tr("Video") + ": " + itemData.mediaStreams[i].DisplayTitle
             else if itemData.MediaStreams[i].Type = "Audio" and audioIdx = invalid
                 audioIdx = i
+                m.top.findNode("audio_codec").text = tr("Audio") + ": " + itemData.mediaStreams[i].DisplayTitle
             end if
             if videoIdx <> invalid and audioIdx <> invalid then exit for
         end for
-        m.top.findNode("video_codec").text = tr("Video") + ": " + itemData.mediaStreams[videoIdx].DisplayTitle
-        m.top.findNode("audio_codec").text = tr("Audio") + ": " + itemData.mediaStreams[audioIdx].DisplayTitle
-        m.top.findNode("video_codec").visible = true
-        m.top.findNode("audio_codec").visible = true
-    else
-        m.top.findNode("video_codec").visible = false
-        m.top.findNode("audio_codec").visible = false
     end if
+    m.top.findNode("video_codec").visible = videoIdx <> invalid
+    m.top.findNode("audio_codec").visible = audioIdx <> invalid
+    
 end sub
 
 function getRuntime() as integer