diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index 770c643de..0d5207d3b 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -281,6 +281,14 @@ void CComponentsHeader::initLogo()
 	else
 		cch_logo_obj->setChannel(cch_logo.Id, cch_logo.Name);
 
+	//ensure logo is not larger than original size if in auto mode
+	if (cch_logo.dy_max == -1){
+		int dx_orig = 0, dy_orig = 0 ;
+		cch_logo_obj->getRealSize(&dx_orig, &dy_orig);
+		if (cch_logo.dy_max > dy_orig)
+			cch_logo.dy_max = dy_orig;
+	}
+
 	if (cch_logo_obj->hasLogo()){
 		cch_logo_obj->setHeight(cch_logo.dy_max, true);
 
diff --git a/src/gui/components/cc_frm_header.h b/src/gui/components/cc_frm_header.h
index a525a3ecc..320c59282 100644
--- a/src/gui/components/cc_frm_header.h
+++ b/src/gui/components/cc_frm_header.h
@@ -319,6 +319,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
 		* 		CC_LOGO_RIGHT \n
 		* @param[in]  	dy
 		* 		@li optional logo height, default = -1 (auto)
+		* @note 	In auto mode, logo use full height minus inner offset but not larger than original logo height.
 		*/
 		void setChannelLogo(	const uint64_t& channelId,
 					const std::string& channelName,