diff --git a/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift b/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift
index c6cf4442b8..ebabf4ab90 100644
--- a/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift
+++ b/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift
@@ -6,7 +6,7 @@ import SwiftSignalKit
 import SyncCore
 
 private func copyOrMoveResourceData(from fromResource: MediaResource, to toResource: MediaResource, mediaBox: MediaBox) {
-    if fromResource is CloudFileMediaResource || fromResource is CloudDocumentMediaResource {
+    if fromResource is CloudFileMediaResource || fromResource is CloudDocumentMediaResource || fromResource is SecretFileMediaResource {
         mediaBox.copyResourceData(from: fromResource.id, to: toResource.id)
     } else {
         mediaBox.moveResourceData(from: fromResource.id, to: toResource.id)
diff --git a/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift b/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift
index 67e7c1aabf..acfa06d2d7 100644
--- a/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift
+++ b/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift
@@ -71,7 +71,7 @@ public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateMan
             if let video = video {
                 mappedVideo = video
                 |> take(until: { value in
-                    if case let .result(resultData) = value?.content, case .inputFile = resultData {
+                    if case let .result(resultData)? = value?.content, case .inputFile = resultData {
                         return SignalTakeAction(passthrough: true, complete: true)
                     } else {
                         return SignalTakeAction(passthrough: true, complete: false)
diff --git a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift b/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
index 16b490b314..6d248bfa43 100644
--- a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
+++ b/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
@@ -662,7 +662,7 @@ private func uploadedMediaFileContent(network: Network, postbox: Postbox, auxili
                     return .single(.pending)
                 case let .done(media):
                     if let media = media as? TelegramMediaFile, let smallestThumbnail = smallestImageRepresentation(media.previewRepresentations) {
-                        if peerId.namespace == Namespaces.Peer.SecretChat {
+                        if peerId.namespace == Namespaces.Peer.SecretChat || (smallestThumbnail.resource is LocalFileMediaResource) {
                             return .single(.done(media, .none))
                         } else {
                             let fileReference: AnyMediaReference