diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java
index be74e6371..f8a187ea5 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java
@@ -199,7 +199,7 @@ public class Result implements Parcelable {
     }
 
     public List<Sub> getSubs() {
-        return subs == null ? new ArrayList<>() : subs;
+        return subs == null ? new ArrayList<>() : new ArrayList<>(subs);
     }
 
     public JsonElement getHeader() {
@@ -235,7 +235,7 @@ public class Result implements Parcelable {
     }
 
     public List<Danmaku> getDanmaku() {
-        return !Setting.isDanmakuLoad() || danmaku == null ? new ArrayList<>() : danmaku;
+        return !Setting.isDanmakuLoad() || danmaku == null ? new ArrayList<>() : new ArrayList<>(danmaku);
     }
 
     public String getFormat() {
diff --git a/app/src/main/java/com/fongmi/android/tv/gson/DanmakuAdapter.java b/app/src/main/java/com/fongmi/android/tv/gson/DanmakuAdapter.java
index 048149993..7448bcf59 100644
--- a/app/src/main/java/com/fongmi/android/tv/gson/DanmakuAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/gson/DanmakuAdapter.java
@@ -9,7 +9,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 
 import java.lang.reflect.Type;
-import java.util.Arrays;
 import java.util.List;
 
 public class DanmakuAdapter implements JsonDeserializer<List<Danmaku>> {
@@ -19,6 +18,6 @@ public class DanmakuAdapter implements JsonDeserializer<List<Danmaku>> {
         if (!json.isJsonPrimitive()) return App.gson().fromJson(json, typeOfT);
         String text = json.getAsString().trim();
         if (Json.isArray(text)) return App.gson().fromJson(text, typeOfT);
-        else return Arrays.asList(Danmaku.from(text));
+        else return List.of(Danmaku.from(text));
     }
 }