diff --git a/HISTORY b/HISTORY
index ce3b65b..99f2b04 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
  
+- Start writer right after creating it
 - Corrected typos (thanks to Ville Skyttä)
 - Fixed compiler error in client/device.c with VDR < 1.7.22 (reported by
   Uwe@vdrportal)
diff --git a/server/streamer.c b/server/streamer.c
index 10c267f..e9f3830 100644
--- a/server/streamer.c
+++ b/server/streamer.c
@@ -128,6 +128,7 @@ void cStreamdevStreamer::Start(cTBSocket *Socket)
 {
 	Dprintf("start streamer\n");
 	m_Writer = new cStreamdevWriter(Socket, this);
+	m_Writer->Start();
 	Attach();
 }
 
@@ -135,7 +136,6 @@ void cStreamdevStreamer::Activate(bool On)
 {
 	if (On && !Active()) {
 		Dprintf("activate streamer\n");
-		m_Writer->Start();
 		cThread::Start();
 	}
 }