diff --git a/src/main/java/ru/serega6531/packmate/service/StreamService.java b/src/main/java/ru/serega6531/packmate/service/StreamService.java
index e00e3b8..f04e57d 100644
--- a/src/main/java/ru/serega6531/packmate/service/StreamService.java
+++ b/src/main/java/ru/serega6531/packmate/service/StreamService.java
@@ -155,26 +155,28 @@ public class StreamService {
 
         for (int i = 0; i < packets.size(); i++) {
             Packet packet = packets.get(i);
-            if (packet.isIncoming() != incoming || i == packets.size() - 1) {
+            if (packet.isIncoming() != incoming) {
                 if (packetsInRow > 1) {
                     final List<Packet> cut = packets.subList(start, i);
-                    packets.removeAll(cut);
+                    final long timestamp = cut.get(0).getTimestamp();
+                    final boolean ungzipped = cut.stream().anyMatch(Packet::isUngzipped);
                     //noinspection OptionalGetWithoutIsPresent
                     final byte[] content = cut.stream()
                             .map(Packet::getContent)
                             .reduce(ArrayUtils::addAll)
                             .get();
 
+                    packets.removeAll(cut);
                     packets.add(start, Packet.builder()
                             .incoming(incoming)
-                            .timestamp(packets.get(0).getTimestamp())
-                            .ungzipped(cut.stream().anyMatch(Packet::isUngzipped))
+                            .timestamp(timestamp)
+                            .ungzipped(ungzipped)
                             .content(content)
                             .build());
-                }
 
-                start++;
-                i = start;
+                    i++;
+                }
+                start = i;
                 packetsInRow = 1;
             } else {
                 packetsInRow++;
@@ -182,6 +184,25 @@ public class StreamService {
 
             incoming = packet.isIncoming();
         }
+
+        if (packetsInRow > 1) {
+            final List<Packet> cut = packets.subList(start, packets.size());
+            final long timestamp = cut.get(0).getTimestamp();
+            final boolean ungzipped = cut.stream().anyMatch(Packet::isUngzipped);
+            //noinspection OptionalGetWithoutIsPresent
+            final byte[] content = cut.stream()
+                    .map(Packet::getContent)
+                    .reduce(ArrayUtils::addAll)
+                    .get();
+
+            packets.removeAll(cut);
+            packets.add(Packet.builder()
+                    .incoming(incoming)
+                    .timestamp(timestamp)
+                    .ungzipped(ungzipped)
+                    .content(content)
+                    .build());
+        }
     }
 
     private void unpackGzip(List<Packet> packets) {