diff --git a/winixd/main/main.cpp b/winixd/main/main.cpp
index 11423ab..f0195c9 100644
--- a/winixd/main/main.cpp
+++ b/winixd/main/main.cpp
@@ -508,15 +508,6 @@ void UninitializeWinix(Log & log, bool was_winix_running)
 {
 	Winix::RemovePidFile();
 	Winix::CleanupCurlLibrary();
-
-	if( was_winix_running )
-	{
-		log << Winix::logsave;
-	}
-	else
-	{
-		FlushLogToStdout(log);
-	}
 }
 
 
@@ -564,6 +555,7 @@ int main(int argc, const char ** argv, const char ** env)
 
 	Winix::LogInfo(log, Winix::log1, "Winix", true, "stopped");
 	UninitializeWinix(log, run_status.should_continue);
+	log << Winix::logsave;
 
 	return run_status.exit_code;
 }