diff --git a/Makefile b/Makefile
index 7cc79f175..f91b82442 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # If you want to get_images, you'll also need convert from ImageMagick
 ##########################################################################
 
-VERSION := 2.1.6
+VERSION := 2.1.7
 
 ## usage
 
diff --git a/components/ItemGrid/LoadVideoContentTask.bs b/components/ItemGrid/LoadVideoContentTask.bs
index 2142477c3..fdbddfa6e 100644
--- a/components/ItemGrid/LoadVideoContentTask.bs
+++ b/components/ItemGrid/LoadVideoContentTask.bs
@@ -87,7 +87,9 @@ sub LoadItems_AddVideoContent(video as object, mediaSourceId as dynamic, audio_s
             video.length = meta.json.MediaSources[0].RunTimeTicks / 10000000
         end if
     end if
-    video.MaxVideoDecodeResolution = [meta.json.MediaSources[0].MediaStreams[0].Width, meta.json.MediaSources[0].MediaStreams[0].Height]
+    if isValid(meta.json.MediaSources[0]) and isValid(meta.json.MediaSources[0].MediaStreams[0])
+        video.MaxVideoDecodeResolution = [meta.json.MediaSources[0].MediaStreams[0].Width, meta.json.MediaSources[0].MediaStreams[0].Height]
+    end if
 
     subtitle_idx = m.top.selectedSubtitleIndex
     videotype = LCase(meta.type)
diff --git a/manifest b/manifest
index e5d2bc832..532b80faf 100644
--- a/manifest
+++ b/manifest
@@ -3,7 +3,7 @@
 title=Jellyfin
 major_version=2
 minor_version=1
-build_version=6
+build_version=7
 
 ### Main Menu Icons / Channel Poster Artwork
 
diff --git a/package-lock.json b/package-lock.json
index 3f3ee6834..8cf4e823c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "jellyfin-roku",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jellyfin-roku",
-      "version": "2.1.6",
+      "version": "2.1.7",
       "hasInstallScript": true,
       "license": "GPL-2.0",
       "dependencies": {
diff --git a/package.json b/package.json
index b52c22585..ff420268c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jellyfin-roku",
   "type": "module",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Roku app for Jellyfin media server",
   "dependencies": {
     "@rokucommunity/bslib": "0.1.1",