diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 11827010a..b606a7568 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -352,12 +352,16 @@ ParseCommandLine(int argc, char **argv, CommandLineOptions &options,
 			break;
 
 		case OPTION_NO_DAEMON:
+#ifdef ENABLE_DAEMON
 			options.daemon = false;
+#endif
 			break;
 
 #ifdef __linux__
 		case OPTION_SYSTEMD:
+#ifdef ENABLE_DAEMON
 			options.daemon = false;
+#endif
 			options.systemd = true;
 			break;
 #endif
diff --git a/src/CommandLine.hxx b/src/CommandLine.hxx
index 3f4f2c78e..fe9d6c511 100644
--- a/src/CommandLine.hxx
+++ b/src/CommandLine.hxx
@@ -20,11 +20,18 @@
 #ifndef MPD_COMMAND_LINE_HXX
 #define MPD_COMMAND_LINE_HXX
 
+#include "config.h" // for ENABLE_DAEMON
+
 struct ConfigData;
 
 struct CommandLineOptions {
 	bool kill = false;
+
+#ifdef ENABLE_DAEMON
 	bool daemon = true;
+#else
+	static constexpr bool daemon = false;
+#endif
 
 #ifdef __linux__
 	bool systemd = false;