diff --git a/submodules/TelegramCore/Sources/ManageChannelDiscussionGroup.swift b/submodules/TelegramCore/Sources/ManageChannelDiscussionGroup.swift
index f1c83d3fed..e8fc694411 100644
--- a/submodules/TelegramCore/Sources/ManageChannelDiscussionGroup.swift
+++ b/submodules/TelegramCore/Sources/ManageChannelDiscussionGroup.swift
@@ -78,7 +78,7 @@ public func updateGroupDiscussionForChannel(network: Network, postbox: Postbox,
                         previousGroupId = current.linkedDiscussionPeerId
                         return current.withUpdatedLinkedDiscussionPeerId(.known(groupId))
                     })
-                    if case let .known(maybeValue) = previousGroupId, let value = maybeValue, value != groupId {
+                    if case let .known(maybeValue)? = previousGroupId, let value = maybeValue, value != groupId {
                         transaction.updatePeerCachedData(peerIds: Set([value]), update: { (_, current) -> CachedPeerData? in
                             let cachedData = (current as? CachedChannelData ?? CachedChannelData())
                             return cachedData.withUpdatedLinkedDiscussionPeerId(.known(nil))
@@ -92,7 +92,7 @@ public func updateGroupDiscussionForChannel(network: Network, postbox: Postbox,
                         previousChannelId = current.linkedDiscussionPeerId
                         return current.withUpdatedLinkedDiscussionPeerId(.known(channelId))
                     })
-                    if case let .known(maybeValue) = previousChannelId, let value = maybeValue, value != channelId {
+                    if case let .known(maybeValue)? = previousChannelId, let value = maybeValue, value != channelId {
                         transaction.updatePeerCachedData(peerIds: Set([value]), update: { (_, current) -> CachedPeerData? in
                             let cachedData = (current as? CachedChannelData ?? CachedChannelData())
                             return cachedData.withUpdatedLinkedDiscussionPeerId(.known(nil))
diff --git a/submodules/TelegramCore/Sources/RequestUserPhotos.swift b/submodules/TelegramCore/Sources/RequestUserPhotos.swift
index 3b04bdfbe7..5d4f40d963 100644
--- a/submodules/TelegramCore/Sources/RequestUserPhotos.swift
+++ b/submodules/TelegramCore/Sources/RequestUserPhotos.swift
@@ -121,7 +121,7 @@ public func requestPeerPhotos(postbox: Postbox, network: Network, peerId: PeerId
                                 switch media.action {
                                     case let .photoUpdated(image):
                                         if let image = image {
-                                            photos.append(TelegramPeerPhoto(image: image, reference: nil, date: message.timestamp, index: index, totalCount: messages.count, messageId: message.id))
+                                            photos.append(TelegramPeerPhoto(image: image, reference: image.reference, date: message.timestamp, index: index, totalCount: messages.count, messageId: message.id))
                                         }
                                     default:
                                         break