diff --git a/submodules/MediaPlayer/Sources/MediaPlayerFramePreview.swift b/submodules/MediaPlayer/Sources/MediaPlayerFramePreview.swift
index 1abdc20c9c..fd06ca9fdb 100644
--- a/submodules/MediaPlayer/Sources/MediaPlayerFramePreview.swift
+++ b/submodules/MediaPlayer/Sources/MediaPlayerFramePreview.swift
@@ -63,26 +63,28 @@ private final class MediaPlayerFramePreviewImpl {
         let takeDisposable = MetaDisposable()
         let disposable = (self.context.get()
         |> take(1)).start(next: { [weak self] context in
-            queue.async {
+            queue.justDispatch {
                 guard context.queue === queue else {
                     return
                 }
                 context.with { context in
                     let disposable = context.source.takeFrame(at: timestamp).start(next: { result in
-                        guard let strongSelf = self else {
-                            return
-                        }
-                        switch result {
-                        case .waitingForData:
-                            strongSelf.framePipe.putNext(.waitingForData)
-                        case let .image(image):
-                            if let image = image {
-                                strongSelf.framePipe.putNext(.image(image))
+                        queue.async {
+                            guard let strongSelf = self else {
+                                return
                             }
-                            strongSelf.currentFrameTimestamp = nil
-                            if let nextFrameTimestamp = strongSelf.nextFrameTimestamp {
-                                strongSelf.nextFrameTimestamp = nil
-                                strongSelf.generateFrame(at: nextFrameTimestamp)
+                            switch result {
+                            case .waitingForData:
+                                strongSelf.framePipe.putNext(.waitingForData)
+                            case let .image(image):
+                                if let image = image {
+                                    strongSelf.framePipe.putNext(.image(image))
+                                }
+                                strongSelf.currentFrameTimestamp = nil
+                                if let nextFrameTimestamp = strongSelf.nextFrameTimestamp {
+                                    strongSelf.nextFrameTimestamp = nil
+                                    strongSelf.generateFrame(at: nextFrameTimestamp)
+                                }
                             }
                         }
                     })
@@ -91,8 +93,10 @@ private final class MediaPlayerFramePreviewImpl {
             }
         })
         self.currentFrameDisposable.set(ActionDisposable {
-            takeDisposable.dispose()
-            disposable.dispose()
+            queue.async {
+                takeDisposable.dispose()
+                disposable.dispose()
+            }
         })
     }
     
diff --git a/submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift b/submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift
index d942ef61d4..2d098b723d 100644
--- a/submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift
+++ b/submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift
@@ -249,11 +249,11 @@ private final class UniversalSoftwareVideoSourceImpl {
     
         self.currentNumberOfReads = 0
         self.currentReadBytes = 0
-        for i in 0 ..< 10 {
+        for _ in 0 ..< 10 {
             let (decodableFrame, loop) = self.readDecodableFrame()
             if let decodableFrame = decodableFrame {
                 if let renderedFrame = videoStream.decoder.render(frame: decodableFrame) {
-                    print("Frame rendered in \(self.currentNumberOfReads) reads, \(self.currentReadBytes) bytes, total frames read: \(i + 1)")
+                    //print("Frame rendered in \(self.currentNumberOfReads) reads, \(self.currentReadBytes) bytes, total frames read: \(i + 1)")
                     return (renderedFrame, CGFloat(videoStream.rotationAngle), CGFloat(videoStream.aspect), loop)
                 }
             }
@@ -332,11 +332,11 @@ private final class UniversalSoftwareVideoSourceThread: NSObject {
         source.cancelRead = params.cancel
         source.requiredDataIsNotLocallyAvailable = params.requiredDataIsNotLocallyAvailable
         source.state.set(.generatingFrame)
-        let startTime = CFAbsoluteTimeGetCurrent()
         let image = source.readImage(at: params.timestamp).0
-        params.completion(image)
+        source.cancelRead = .single(false)
+        source.requiredDataIsNotLocallyAvailable = nil
         source.state.set(.ready)
-        print("take frame: \(CFAbsoluteTimeGetCurrent() - startTime) s")
+        params.completion(image)
     }
 }
 
diff --git a/submodules/TelegramCore/TelegramCore/MultipartFetch.swift b/submodules/TelegramCore/TelegramCore/MultipartFetch.swift
index 388dd47aa4..50f4861c58 100644
--- a/submodules/TelegramCore/TelegramCore/MultipartFetch.swift
+++ b/submodules/TelegramCore/TelegramCore/MultipartFetch.swift
@@ -605,9 +605,6 @@ private final class MultipartFetchManager {
             while 1024 * 1024 % downloadRange.count != 0 {
                 downloadRange = downloadRange.lowerBound ..< (downloadRange.upperBound - 1)
             }
-            if case .maximum = priority {
-                print("fetch maximum \(downloadRange.lowerBound), \(downloadRange.count)")
-            }
             
             var intervalIndexSet = IndexSet(integersIn: intervalsToFetch[currentIntervalIndex].0)
             intervalIndexSet.remove(integersIn: downloadRange)