diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java index fc065b4c42..ea7461dc1c 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java +++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java @@ -520,8 +520,9 @@ private VideoOptions buildExoPlayerOptions(@Nullable Integer forcedSubtitleIndex internalOptions.setEnableDirectStream(false); internalOptions.setMaxAudioChannels(Utils.downMixAudio(mFragment.getContext()) ? 2 : null); //have to downmix at server internalOptions.setSubtitleStreamIndex(forcedSubtitleIndex); - if (!isLiveTv) { - internalOptions.setMediaSourceId(getCurrentMediaSource().getId()); + MediaSourceInfo currentMediaSource = getCurrentMediaSource(); + if (!isLiveTv && currentMediaSource != null) { + internalOptions.setMediaSourceId(currentMediaSource.getId()); } DeviceProfile internalProfile = new ExoPlayerProfile( mFragment.getContext(),