diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index b7edf6af0..9d8f6deb7 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -1015,7 +1015,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 				break;
 			case CRCInput::RC_info:
 			{
-				if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+				if (g_settings.tmdb_enabled)
 				{
 					showPos = 0;
 					if (!tmdb_active) {
@@ -1366,7 +1366,7 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
 		adzap_button += " " + to_string(g_settings.adzap_zapBackPeriod / 60) + " ";
 		adzap_button += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
 	}
-	bool tmdb = (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+	bool tmdb = g_settings.tmdb_enabled;
 	bool fscr = (has_follow_screenings && !call_fromfollowlist);
 	if (mp_info)
 		::paintButtons(x, y, w, tmdb ? 2 : 1, EpgButtons[2], w, h);
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 2c83b351f..b83284a7d 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1859,7 +1859,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
 					refresh();
 				}
 			}
-			else if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+			else if (g_settings.tmdb_enabled)
 			{
 				//add TMDB Cover
 				fname = m_movieSelectionHandler->file.Name.c_str();
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 1fb8fd12c..ed64cb129 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -809,6 +809,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF);
 	g_settings.youtube_dev_id = configfile.getString("youtube_dev_id","XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
 	g_settings.tmdb_api_key = configfile.getString("tmdb_api_key","XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+	g_settings.tmdb_enabled = ((g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") && !g_settings.tmdb_api_key.empty());
 
 	//Filebrowser
 	g_settings.filebrowser_showrights =  configfile.getInt32("filebrowser_showrights", 1);
diff --git a/src/system/settings.h b/src/system/settings.h
index 733cb2316..dc0af7918 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -725,6 +725,7 @@ struct SNeutrinoSettings
 	int   movieplayer_repeat_on;
 	std::string youtube_dev_id;
 	std::string tmdb_api_key;
+	int tmdb_enabled;
 
 	//zapit setup
 	std::string StartChannelTV;