diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index e2392905a..ea03bb705 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2113,12 +2113,9 @@ bool Message::displayForwardedFrom() const {
 			}
 		}
 		const auto media = this->media();
-		return item->Has<HistoryMessageVia>()
-			|| !media
+		return !media
 			|| !media->isDisplayed()
-			|| !media->hideForwardedFrom()
-			|| (forwarded->originalSender
-				&& forwarded->originalSender->isChannel());
+			|| !media->hideForwardedFrom();
 	}
 	return false;
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index c55c98d16..ca07460d8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -682,6 +682,10 @@ bool GroupedMedia::needsBubble() const {
 	return _needBubble;
 }
 
+bool GroupedMedia::hideForwardedFrom() const {
+	return main()->hideForwardedFrom();
+}
+
 bool GroupedMedia::computeNeedBubble() const {
 	if (!_caption.isEmpty() || _mode == Mode::Column) {
 		return true;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
index 442f9a5b1..6d2692b20 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
@@ -91,6 +91,7 @@ public:
 	bool customHighlight() const override {
 		return true;
 	}
+	bool hideForwardedFrom() const override;
 
 	void stopAnimation() override;
 	void checkAnimation() override;