diff --git a/source/net/filebot/subtitle/SamiDecoder.java b/source/net/filebot/subtitle/SamiDecoder.java
index e84c4534..bb90ab77 100644
--- a/source/net/filebot/subtitle/SamiDecoder.java
+++ b/source/net/filebot/subtitle/SamiDecoder.java
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -16,7 +17,7 @@ import org.jsoup.nodes.Element;
 public class SamiDecoder implements SubtitleDecoder {
 
 	@Override
-	public List<SubtitleElement> decode(String file) {
+	public Stream<SubtitleElement> decode(String file) {
 		List<SubtitleElement> subtitles = new ArrayList<SubtitleElement>();
 
 		Matcher matcher = Pattern.compile("<SYNC(.*?)>", Pattern.CASE_INSENSITIVE).matcher(file);
@@ -63,7 +64,7 @@ public class SamiDecoder implements SubtitleDecoder {
 			}
 		}
 
-		return subtitles;
+		return subtitles.stream();
 	}
 
 	private SubtitleElement getSubtitle(long start, long end, CharSequence fragment) {
diff --git a/source/net/filebot/subtitle/SubtitleDecoder.java b/source/net/filebot/subtitle/SubtitleDecoder.java
index 42e7cae6..5fda2125 100644
--- a/source/net/filebot/subtitle/SubtitleDecoder.java
+++ b/source/net/filebot/subtitle/SubtitleDecoder.java
@@ -1,9 +1,9 @@
 package net.filebot.subtitle;
 
-import java.util.List;
+import java.util.stream.Stream;
 
 public interface SubtitleDecoder {
 
-	List<SubtitleElement> decode(String file);
+	Stream<SubtitleElement> decode(String file);
 
 }
\ No newline at end of file
diff --git a/source/net/filebot/subtitle/SubtitleFormat.java b/source/net/filebot/subtitle/SubtitleFormat.java
index 69bbf4b6..c90cbb26 100644
--- a/source/net/filebot/subtitle/SubtitleFormat.java
+++ b/source/net/filebot/subtitle/SubtitleFormat.java
@@ -1,8 +1,6 @@
 
 package net.filebot.subtitle;
 
-import static java.util.stream.Collectors.*;
-
 import java.util.Scanner;
 
 import net.filebot.MediaTypes;
@@ -14,7 +12,7 @@ public enum SubtitleFormat {
 
 		@Override
 		public SubtitleDecoder getDecoder() {
-			return content -> new SubRipReader(new Scanner(content)).stream().collect(toList());
+			return content -> new SubRipReader(new Scanner(content)).stream();
 		}
 
 		@Override
@@ -27,7 +25,7 @@ public enum SubtitleFormat {
 
 		@Override
 		public SubtitleDecoder getDecoder() {
-			return content -> new MicroDVDReader(new Scanner(content)).stream().collect(toList());
+			return content -> new MicroDVDReader(new Scanner(content)).stream();
 		}
 
 		@Override
@@ -40,7 +38,7 @@ public enum SubtitleFormat {
 
 		@Override
 		public SubtitleDecoder getDecoder() {
-			return content -> new SubViewerReader(new Scanner(content)).stream().collect(toList());
+			return content -> new SubViewerReader(new Scanner(content)).stream();
 		}
 
 		@Override
@@ -53,7 +51,7 @@ public enum SubtitleFormat {
 
 		@Override
 		public SubtitleDecoder getDecoder() {
-			return content -> new SubStationAlphaReader(new Scanner(content)).stream().collect(toList());
+			return content -> new SubStationAlphaReader(new Scanner(content)).stream();
 		}
 
 		@Override
diff --git a/source/net/filebot/subtitle/SubtitleUtilities.java b/source/net/filebot/subtitle/SubtitleUtilities.java
index da5d7a2b..c3a2d91d 100644
--- a/source/net/filebot/subtitle/SubtitleUtilities.java
+++ b/source/net/filebot/subtitle/SubtitleUtilities.java
@@ -330,7 +330,7 @@ public final class SubtitleUtilities {
 
 		// decode subtitle file with the first reader that seems to work
 		for (SubtitleFormat format : likelyFormats) {
-			List<SubtitleElement> subtitles = format.getDecoder().decode(content);
+			List<SubtitleElement> subtitles = format.getDecoder().decode(content).collect(toList());
 
 			if (subtitles.size() > 0) {
 				return subtitles;