diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 2c1c02dcb..b4fd71329 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1221,8 +1221,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
 				infoViewerBB->showIcon_SubT();
 				//infoViewerBB->showIcon_CA_Status(0);
 				infoViewerBB->showIcon_Resolution();
-				if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE)
-					infoViewerBB->showIcon_Tuner();
+				infoViewerBB->showIcon_Tuner();
 			}
 		}
 		return messages_return::handled;
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 131c0a506..5cc01fc8d 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -195,11 +195,8 @@ void CInfoViewerBB::getBBIconInfo()
 				iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h);
 			break;
 		case CInfoViewerBB::ICON_TUNER:
-			if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE) {
-				if (g_settings.infobar_show_tuner == 1) {
-					iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h);
-				}
-			}
+			if (g_settings.infobar_show_tuner == 1)
+				iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h);
 			break;
 		default:
 			break;
@@ -599,6 +596,9 @@ void CInfoViewerBB::showOne_CAIcon()
 
 void CInfoViewerBB::showIcon_Tuner()
 {
+	if(CFEManager::getInstance()->getFrontendCount() <= 1)
+		return;
+
 	std::string icon_name;
 	switch (CFEManager::getInstance()->getLiveFE()->getNumber()) {
 		case 1: