diff --git a/src/store/modules/slplayer/getters.js b/src/store/modules/slplayer/getters.js
index e0b62804..2c810e23 100644
--- a/src/store/modules/slplayer/getters.js
+++ b/src/store/modules/slplayer/getters.js
@@ -227,7 +227,9 @@ export default {
   GET_SUBTITLE_PARAMS: (state, getters) => {
     if (!getters.GET_SELECTED_SUBTITLE_STREAM || getters.CAN_DIRECT_PLAY
       || getters.CAN_DIRECT_PLAY_SUBTITLES) {
-      return null;
+      return {
+        subtitles: 'none',
+      };
     }
 
     if (getters.SHOULD_FORCE_BURN_SUBTITLES) {
diff --git a/src/utils/streams.js b/src/utils/streams.js
index c88e353e..75594384 100644
--- a/src/utils/streams.js
+++ b/src/utils/streams.js
@@ -48,8 +48,10 @@ async function* fetchLineGenerator(url, signal) {
 
 const extractValue = async (nextPromise) => {
   try {
-    const { value } = await nextPromise;
-    return value;
+    const { done, value } = await nextPromise;
+    return done
+      ? null
+      : value;
   } catch (e) {
     return null;
   }