diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 1ac315627..af3e0e685 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -127,7 +127,6 @@
 
 int old_b_id = -1;
 CHintBox * reloadhintBox = 0;
-bool has_hdd;
 
 CInfoClock      *InfoClock;
 int allow_flash = 1;
@@ -2833,9 +2832,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
 					break;
 				}
 			}
-			if(has_hdd) {
-				wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
-			}
+			wakeup_hdd(recordingDir);
 		}
 
 		if( g_settings.recording_zap_on_announce && (mode != mode_standby) && (eventinfo->channel_id != CZapit::getInstance()->GetCurrentChannelID())) {
@@ -3089,7 +3086,9 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 		frameBuffer->paintBackground();
 		videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg");
 
+		CEpgScan::getInstance()->Stop();
 		if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) {
+			g_Sectionsd->setPauseScanning(true);
 			saveEpg(true);// true CVFD::MODE_SHUTDOWN
 		}
 		CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN);