diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 61cf9b2d4..d8d2cd87f 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -4406,7 +4406,7 @@ void CNeutrinoApp::saveEpg(int _mode)
 	{
 		if (_mode == NeutrinoModes::mode_standby)
 		{
-			// skip save epg in standby mode, if last saveepg time < 15 Min.
+			// skip save epg in standby mode, if last saveepg time < 15 minutes
 			std::string index_xml = g_settings.epg_dir.c_str();
 			index_xml += "/index.xml";
 			time_t t=0;
@@ -4415,11 +4415,12 @@ void CNeutrinoApp::saveEpg(int _mode)
 				if (difftime(time(&t), my_stat.st_ctime) < 900)
 					return;
 			}
-			CVFD::getInstance()->Clear();
-			//NI CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
-			CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING));
 		}
 
+		CVFD::getInstance()->Clear();
+		//NI CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
+		CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING));
+
 		printf("[neutrino] Saving EPG to %s...\n", g_settings.epg_dir.c_str());
 		g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str());
 
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index e913930e8..115419214 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -169,7 +169,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
 	int globalProgressBegin = 0;
 
 	if(g_settings.epg_save)
-		CNeutrinoApp::getInstance()->saveEpg(true);
+		CNeutrinoApp::getInstance()->saveEpg(NeutrinoModes::mode_off);
 
 	if(statusViewer)
 		statusViewer->showLocalStatus(0);