diff --git a/components/video/VideoPlayerView.bs b/components/video/VideoPlayerView.bs
index 1aa96ba96..b9fccef22 100644
--- a/components/video/VideoPlayerView.bs
+++ b/components/video/VideoPlayerView.bs
@@ -63,6 +63,9 @@ sub init()
     m.top.retrievingBar.filledBarBlendColor = m.global.constants.colors.blue
     m.top.bufferingBar.filledBarBlendColor = m.global.constants.colors.blue
     m.top.trickPlayBar.filledBarBlendColor = m.global.constants.colors.blue
+
+    ' set MaxVideoDecodeResolution to our TVs video resolution
+    m.top.MaxVideoDecodeResolution = [m.global.device.videoWidth, m.global.device.videoHeight]
 end sub
 
 ' handleChapterSkipAction: Handles user command to skip chapters in playing video
diff --git a/source/Main.bs b/source/Main.bs
index 2ef81455d..5d692d827 100644
--- a/source/Main.bs
+++ b/source/Main.bs
@@ -711,6 +711,9 @@ sub Main (args as dynamic) as void
                 ' The audio codec capability has changed if true.
                 print "event.audioCodecCapabilityChanged = ", event.audioCodecCapabilityChanged
 
+                ' update global device state
+                SaveDeviceToGlobal()
+                ' update the server
                 postTask = createObject("roSGNode", "PostTask")
                 postTask.arrayData = getDeviceCapabilities()
                 postTask.apiUrl = "/Sessions/Capabilities/Full"
@@ -719,6 +722,9 @@ sub Main (args as dynamic) as void
                 ' The video codec capability has changed if true.
                 print "event.videoCodecCapabilityChanged = ", event.videoCodecCapabilityChanged
 
+                ' update global device state
+                SaveDeviceToGlobal()
+                ' update the server
                 postTask = createObject("roSGNode", "PostTask")
                 postTask.arrayData = getDeviceCapabilities()
                 postTask.apiUrl = "/Sessions/Capabilities/Full"