diff --git a/lib/arch/CArchAppUtilWindows.cpp b/lib/arch/CArchAppUtilWindows.cpp
index f2bbf49b..6dbd0ccd 100644
--- a/lib/arch/CArchAppUtilWindows.cpp
+++ b/lib/arch/CArchAppUtilWindows.cpp
@@ -218,7 +218,7 @@ CArchAppUtilWindows::exitApp(int code)
 
 int daemonNTMainLoopStatic(int argc, const char** argv)
 {
-	return CArchAppUtil::instance().app().daemonMainLoop(argc, argv);
+	return CArchAppUtilWindows::instance().daemonNTMainLoop(argc, argv);
 }
 
 int 
diff --git a/lib/synergy/CApp.cpp b/lib/synergy/CApp.cpp
index cd248b5b..e45ea274 100644
--- a/lib/synergy/CApp.cpp
+++ b/lib/synergy/CApp.cpp
@@ -46,7 +46,11 @@ CApp::~CApp()
 }
 
 CApp::CArgsBase::CArgsBase() :
-m_daemon(true),
+#if SYSAPI_WIN32
+m_daemon(false), // daemon mode not supported on windows (use --service)
+#else
+m_daemon(true), // backward compatibility for unix (daemon by default)
+#endif
 m_backend(false),
 m_restartable(true),
 m_noHooks(false),