diff --git a/src/octoprint/cli/__init__.py b/src/octoprint/cli/__init__.py
index 8ea8db7f..7a4133ce 100644
--- a/src/octoprint/cli/__init__.py
+++ b/src/octoprint/cli/__init__.py
@@ -160,11 +160,11 @@ def octo(ctx, **kwargs):
 			           "start|stop|restart\" is deprecated, please use "
 			           "\"octoprint daemon start|stop|restart\" from now on")
 
-			if sys.platform.startswith("linux") or sys.platform.startswith("freebsd"):
+			if sys.platform == "win32" or sys.platform == "darwin":
+				click.echo("Sorry, daemon mode is not supported under your operating system right now")
+			else:
 				from octoprint.cli.server import daemon_command
 				ctx.invoke(daemon_command, command=daemon, **kwargs)
-			else:
-				click.echo("Sorry, daemon mode is not supported under your operating system right now")
 		else:
 			click.echo("Starting the server via \"octoprint\" is deprecated, "
 			           "please use \"octoprint serve\" from now on.")
diff --git a/src/octoprint/cli/server.py b/src/octoprint/cli/server.py
index f7539d0a..cfadc559 100644
--- a/src/octoprint/cli/server.py
+++ b/src/octoprint/cli/server.py
@@ -150,8 +150,8 @@ def serve_command(ctx, **kwargs):
 	           allow_root, logging, verbosity, safe_mode)
 
 
-if sys.platform.startswith("linux") or sys.platform.startswith("freebsd"):
-	# we only support daemon mode under Linux and FreeBSD for now
+if sys.platform != "win32" and sys.platform != "darwin":
+	# we do not support daemon mode under windows or macosx
 
 	@server_commands.command(name="daemon")
 	@server_options