diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageSuggestedPostInfoNode/Sources/ChatMessageSuggestedPostInfoNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageSuggestedPostInfoNode/Sources/ChatMessageSuggestedPostInfoNode.swift
index d42fdd4fee..4d7b205375 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageSuggestedPostInfoNode/Sources/ChatMessageSuggestedPostInfoNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageSuggestedPostInfoNode/Sources/ChatMessageSuggestedPostInfoNode.swift
@@ -137,9 +137,7 @@ public final class ChatMessageSuggestedPostInfoNode: ASDisplayNode {
                     }
                 } else {
                     var channelName = ""
-                    if item.message.author is TelegramChannel {
-                        channelName = item.message.author.flatMap(EnginePeer.init)?.compactDisplayTitle ?? " "
-                    }
+                    channelName = item.message.author.flatMap(EnginePeer.init)?.compactDisplayTitle ?? " "
                     if changedText && changedMedia && changedPrice && changedTime {
                         titleText = item.presentationData.strings.Chat_PostSuggestion_ChannelChangePTC(channelName).string
                     } else if changedText && changedPrice && changedTime {
diff --git a/submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionController.swift b/submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionController.swift
index 60ffa8920e..db095daadd 100644
--- a/submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionController.swift
+++ b/submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionController.swift
@@ -289,7 +289,7 @@ public final class PeerSelectionControllerImpl: ViewController, PeerSelectionCon
                         TelegramEngine.EngineData.Item.Peer.Peer(id: linkedMonoforumId)
                     )
                 } else {
-                    mainPeer = .single(nil)
+                    mainPeer = .single(EnginePeer.channel(peer))
                 }
                 
                 let _ = (mainPeer |> deliverOnMainQueue).startStandalone(next: { [weak self] mainPeer in