diff --git a/lib/models/items/media_streams_model.dart b/lib/models/items/media_streams_model.dart
index d677d3f..af9c9df 100644
--- a/lib/models/items/media_streams_model.dart
+++ b/lib/models/items/media_streams_model.dart
@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 
-// ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'package:collection/collection.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
@@ -38,7 +37,7 @@ class MediaStreamsModel {
   }
 
   AudioStreamModel? get currentAudioStream {
-    if (defaultAudioStreamIndex == -1) {
+    if (defaultAudioStreamIndex == -1 || defaultAudioStreamIndex == null) {
       return AudioStreamModel.no();
     }
     return audioStreams.firstWhereOrNull((element) => element.index == defaultAudioStreamIndex) ??
@@ -46,7 +45,7 @@ class MediaStreamsModel {
   }
 
   SubStreamModel? get currentSubStream {
-    if (defaultSubStreamIndex == -1) {
+    if (defaultSubStreamIndex == -1 || defaultSubStreamIndex == null) {
       return SubStreamModel.no();
     }
     return subStreams.firstWhereOrNull((element) => element.index == defaultSubStreamIndex) ?? subStreams.firstOrNull;
diff --git a/lib/models/video_stream_model.dart b/lib/models/video_stream_model.dart
index cb57e64..2e0a1e4 100644
--- a/lib/models/video_stream_model.dart
+++ b/lib/models/video_stream_model.dart
@@ -104,7 +104,7 @@ class VideoStream {
   final MediaStreamsModel? mediaStreamsModel;
 
   AudioStreamModel? get currentAudioStream {
-    if (audioStreamIndex == -1) {
+    if (audioStreamIndex == -1 || audioStreamIndex == null) {
       return null;
     }
     return mediaStreamsModel?.audioStreams.firstWhereOrNull(
@@ -112,7 +112,7 @@ class VideoStream {
   }
 
   SubStreamModel? get currentSubStream {
-    if (subtitleStreamIndex == -1) {
+    if (subtitleStreamIndex == -1 || subtitleStreamIndex == null) {
       return null;
     }
     return mediaStreamsModel?.subStreams.firstWhereOrNull(