diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 679c0642c..2f903dbb2 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -814,7 +814,8 @@ object_ptr<Ui::RpWidget> Controller::createHistoryVisibilityEdit() {
 	auto channel = _peer->asChannel();
 	if (!channel
 		|| !channel->canEditPreHistoryHidden()
-		|| !channel->isMegagroup()) {
+		|| !channel->isMegagroup()
+		|| (channel->isPublic() && !channel->canEditUsername())) {
 		return nullptr;
 	}
 	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(