diff --git a/deploy/windows/wix-patch.xml.in b/deploy/windows/wix-patch.xml.in
index fdc1ddfb0..e95865bd6 100644
--- a/deploy/windows/wix-patch.xml.in
+++ b/deploy/windows/wix-patch.xml.in
@@ -17,6 +17,7 @@
       />
     </ServiceInstall>
     <ServiceControl Id="ServiceControl" Name="Deskflow" Remove="uninstall" Start="install" Stop="both"/>
+    <RemoveFile Id="RmOldLog" On="install" Name="deskflow-daemon.log"/>
   </CPackWiXFragment>
 
   <CPackWiXFragment Id="CM_CP_deskflow_server.exe">
diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp
index ff216bd3a..ee9ffc94e 100644
--- a/src/lib/common/Settings.cpp
+++ b/src/lib/common/Settings.cpp
@@ -129,11 +129,7 @@ QVariant Settings::defaultValue(const QString &key)
   }
 
   if (key == Daemon::LogFile) {
-#ifdef Q_OS_WIN
-    return QStringLiteral("%1/%2").arg(QCoreApplication::applicationDirPath(), kDaemonLogFilename);
-#else
     return QStringLiteral("%1/%2").arg(Settings::settingsPath(), kDaemonLogFilename);
-#endif
   }
 
   return QVariant();