diff --git a/Daemon.cpp b/Daemon.cpp
index 8b7fcd6e..b3d74de6 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -67,13 +67,18 @@ namespace i2p
 			// initialize log			
 			if (isLogging)
 			{
-				std::string logfile_path = i2p::util::filesystem::GetDataDir().string();
-#ifndef _WIN32
-				logfile_path.append("/debug.log");
-#else
-				logfile_path.append("\\debug.log");
-#endif
-				StartLog (logfile_path);
+				if (isDaemon)
+				{
+					std::string logfile_path = i2p::util::filesystem::GetDataDir().string();
+	#ifndef _WIN32
+					logfile_path.append("/debug.log");
+	#else
+					logfile_path.append("\\debug.log");
+	#endif
+					StartLog (logfile_path);
+				}
+				else
+					StartLog (""); // write to stdout
 			}
 
 			d.httpServer = new i2p::util::HTTPServer(i2p::util::config::GetArg("-httpport", 7070));
diff --git a/Log.h b/Log.h
index 3abe0a28..9195ca03 100644
--- a/Log.h
+++ b/Log.h
@@ -44,7 +44,8 @@ inline void StartLog (const std::string& fullFilePath)
 	if (!g_Log)
 	{	
 		g_Log = new Log ();
-		g_Log->SetLogFile (fullFilePath);
+		if (fullFilePath.length () > 0)
+			g_Log->SetLogFile (fullFilePath);
 	}	
 }