diff --git a/DMR2YSF/DMR2YSF.cpp b/DMR2YSF/DMR2YSF.cpp
index 72fd90a..1180327 100644
--- a/DMR2YSF/DMR2YSF.cpp
+++ b/DMR2YSF/DMR2YSF.cpp
@@ -160,7 +160,6 @@ int CDMR2YSF::run()
 
 		::close(STDIN_FILENO);
 		::close(STDOUT_FILENO);
-		::close(STDERR_FILENO);
 
 		// If we are currently root...
 		if (getuid() == 0) {
@@ -199,6 +198,9 @@ int CDMR2YSF::run()
 		return 1;
 	}
 
+	if (m_daemon)
+		::close(STDERR_FILENO);
+
 	m_callsign = m_conf.getCallsign();
 	m_defsrcid = m_conf.getDMRId();
 
@@ -548,7 +550,7 @@ int CDMR2YSF::run()
 			
 			m_dmrLastDT = DataType;
 		}
-		
+
 		if (ysfWatch.elapsed() > YSF_FRAME_PER) {
 			unsigned int ysfFrameType = m_conv.getYSF(m_ysfFrame + 35U);