diff --git a/submodules/TelegramUI/Components/BatchVideoRendering/Sources/BatchVideoRenderingContext.swift b/submodules/TelegramUI/Components/BatchVideoRendering/Sources/BatchVideoRenderingContext.swift
index a1e6aded48c..c7e6e304c1e 100644
--- a/submodules/TelegramUI/Components/BatchVideoRendering/Sources/BatchVideoRenderingContext.swift
+++ b/submodules/TelegramUI/Components/BatchVideoRendering/Sources/BatchVideoRenderingContext.swift
@@ -14,6 +14,18 @@ public protocol BatchVideoRenderingContextTarget: AnyObject {
 }
 
 public final class BatchVideoRenderingContext {
+    struct ReaderLoopState {
+        private var hasProducedFrame: Bool = false
+
+        var shouldRestartReaderAtEndOfStream: Bool {
+            return self.hasProducedFrame
+        }
+
+        mutating func didProduceFrame() {
+            self.hasProducedFrame = true
+        }
+    }
+
     public typealias Target = BatchVideoRenderingContextTarget
     
     public final class TargetHandle {
@@ -92,6 +104,7 @@ public final class BatchVideoRenderingContext {
         
         var isFailed: Bool = false
         var reader: FFMpegFileReader?
+        var readerLoopState = ReaderLoopState()
         
         init(dataPath: String) {
             self.dataPath = dataPath
@@ -115,6 +128,7 @@ public final class BatchVideoRenderingContext {
                         break outer
                     }
                     self.reader = reader
+                    self.readerLoopState = ReaderLoopState()
                 }
                 
                 guard let reader = self.reader else {
@@ -123,12 +137,18 @@ public final class BatchVideoRenderingContext {
                 
                 switch reader.readFrame() {
                 case let .frame(frame):
+                    self.readerLoopState.didProduceFrame()
                     return createSampleBuffer(fromSampleBuffer: frame.sampleBuffer, withTimeOffset: .zero, duration: nil, displayImmediately: true)
                 case .error:
                     self.isFailed = true
                     break outer
                 case .endOfStream:
-                    self.reader = nil
+                    if self.readerLoopState.shouldRestartReaderAtEndOfStream {
+                        self.reader = nil
+                    } else {
+                        self.isFailed = true
+                        break outer
+                    }
                 case .waitingForMoreData:
                     // Invariant: the reader is only constructed once the consumer's
                     // `data.isComplete == true` (see `BatchVideoRenderingContext.update`),