diff --git a/TelegramCore/ManagedSynchronizeRecentlyUsedMediaOperations.swift b/TelegramCore/ManagedSynchronizeRecentlyUsedMediaOperations.swift
index 2b92f6b42c..7b13a4f455 100644
--- a/TelegramCore/ManagedSynchronizeRecentlyUsedMediaOperations.swift
+++ b/TelegramCore/ManagedSynchronizeRecentlyUsedMediaOperations.swift
@@ -158,8 +158,8 @@ private func synchronizeRecentlyUsedMedia(transaction: Transaction, postbox: Pos
                         |> mapError { _ -> SaveRecentlyUsedMediaError in
                             return .generic
                         }
-                        |> mapToSignal { resource -> Signal<Api.Bool, SaveRecentlyUsedMediaError> in
-                            if let resource = resource as? TelegramCloudMediaResourceWithFileReference, let reference = resource.fileReference {
+                        |> mapToSignal { validatedResource -> Signal<Api.Bool, SaveRecentlyUsedMediaError> in
+                            if let resource = validatedResource.updatedResource as? TelegramCloudMediaResourceWithFileReference, let reference = resource.fileReference {
                                 return addSticker(reference)
                             } else {
                                 return .fail(.generic)
diff --git a/TelegramCore/ManagedSynchronizeSavedGifsOperations.swift b/TelegramCore/ManagedSynchronizeSavedGifsOperations.swift
index 8630401104..4334fc65f6 100644
--- a/TelegramCore/ManagedSynchronizeSavedGifsOperations.swift
+++ b/TelegramCore/ManagedSynchronizeSavedGifsOperations.swift
@@ -154,8 +154,8 @@ private func synchronizeSavedGifs(transaction: Transaction, postbox: Postbox, ne
                         |> mapError { _ -> SaveGifError in
                             return .generic
                         }
-                        |> mapToSignal { resource -> Signal<Api.Bool, SaveGifError> in
-                            if let resource = resource as? TelegramCloudMediaResourceWithFileReference, let reference = resource.fileReference {
+                        |> mapToSignal { validatedResource -> Signal<Api.Bool, SaveGifError> in
+                            if let resource = validatedResource.updatedResource as? TelegramCloudMediaResourceWithFileReference, let reference = resource.fileReference {
                                 return saveGif(reference)
                             } else {
                                 return .fail(.generic)
diff --git a/TelegramCore/ManagedSynchronizeSavedStickersOperations.swift b/TelegramCore/ManagedSynchronizeSavedStickersOperations.swift
index d5fd11b660..8fdca73422 100644
--- a/TelegramCore/ManagedSynchronizeSavedStickersOperations.swift
+++ b/TelegramCore/ManagedSynchronizeSavedStickersOperations.swift
@@ -154,8 +154,8 @@ private func synchronizeSavedStickers(transaction: Transaction, postbox: Postbox
                         |> mapError { _ -> SaveStickerError in
                             return .generic
                         }
-                        |> mapToSignal { resource -> Signal<Api.Bool, SaveStickerError> in
-                            if let resource = resource as? TelegramCloudMediaResourceWithFileReference, let reference = resource.fileReference {
+                        |> mapToSignal { validatedResource -> Signal<Api.Bool, SaveStickerError> in
+                            if let resource = validatedResource.updatedResource as? TelegramCloudMediaResourceWithFileReference, let reference = resource.fileReference {
                                 return saveSticker(reference)
                             } else {
                                 return .fail(.generic)
diff --git a/TelegramCore/PendingMessageUploadedContent.swift b/TelegramCore/PendingMessageUploadedContent.swift
index 622faa5005..1de3007194 100644
--- a/TelegramCore/PendingMessageUploadedContent.swift
+++ b/TelegramCore/PendingMessageUploadedContent.swift
@@ -108,7 +108,7 @@ func mediaContentToUpload(network: Network, postbox: Postbox, auxiliaryMethods:
                         return .generic
                     }
                     |> mapToSignal { validatedResource -> Signal<PendingMessageUploadedContentResult, PendingMessageUploadError> in
-                        if let validatedResource = validatedResource as? TelegramCloudMediaResourceWithFileReference, let reference = validatedResource.fileReference {
+                        if let validatedResource = validatedResource.updatedResource as? TelegramCloudMediaResourceWithFileReference, let reference = validatedResource.fileReference {
                             return .single(.content(PendingMessageUploadedContentAndReuploadInfo(content: .media(Api.InputMedia.inputMediaDocument(flags: 0, id: Api.InputDocument.inputDocument(id: resource.fileId, accessHash: resource.accessHash, fileReference: Buffer(data: reference)), ttlSeconds: nil), text), reuploadInfo: nil)))
                         } else {
                             return .fail(.generic)