diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 7339be97c..91aa8ae0b 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3722,6 +3722,8 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
 			skipShutdownTimer = (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWNTIMER_ANNOUNCE, CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 5) == CMsgBox::mbrYes);
 	}
 	else if( msg == NeutrinoMessages::SHUTDOWN ) {
+		if(CStreamManager::getInstance()->StreamStatus())
+			skipShutdownTimer = true;
 		if(!skipShutdownTimer) {
 			ExitRun(g_info.hw_caps->can_shutdown);
 		}