1 files changed, 10 insertions, 0 deletions
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index 7983c1f6a..08dfc87bd 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -204,6 +204,11 @@ namespace MediaBrowser.Api.Playback
                     return Convert.ToInt32(newSize.Width);
                 }
 
+                if (VideoRequest == null)
+                {
+                    return null;
+                }
+
                 return VideoRequest.MaxWidth ?? VideoRequest.Width;
             }
         }
@@ -229,6 +234,11 @@ namespace MediaBrowser.Api.Playback
                     return Convert.ToInt32(newSize.Height);
                 }
 
+                if (VideoRequest == null)
+                {
+                    return null;
+                }
+
                 return VideoRequest.MaxHeight ?? VideoRequest.Height;
             }
         }