diff --git a/src/octoprint/cli/__init__.py b/src/octoprint/cli/__init__.py
index 2aa378ec..692f88b4 100644
--- a/src/octoprint/cli/__init__.py
+++ b/src/octoprint/cli/__init__.py
@@ -74,7 +74,7 @@ def set_ctx_obj_option(ctx, param, value):
 @hidden_option("--port", type=click.INT)
 @hidden_option("--logging", type=click.Path())
 @hidden_option("--daemon", type=click.Choice(["start", "stop", "restart"]))
-@hidden_option("--pid", type=click.Path())
+@hidden_option("--pid", type=click.Path(), default="/tmp/octoprint.pid")
 @hidden_option("--iknowwhatimdoing", "allow_root", is_flag=True)
 @click.version_option(version=octoprint.__version__)
 @click.pass_context
diff --git a/src/octoprint/cli/server.py b/src/octoprint/cli/server.py
index 135967bd..82b5b318 100644
--- a/src/octoprint/cli/server.py
+++ b/src/octoprint/cli/server.py
@@ -58,7 +58,7 @@ def serve_command(obj, host, port, logging, allow_root, debug):
 
 
 @server_commands.command(name="daemon")
-@click.option("--pid", type=click.Path(),
+@click.option("--pid", type=click.Path(), default="/tmp/octoprint.pid",
               help="Pidfile to use for daemonizing.")
 @click.option("--host", type=click.STRING,
               help="Specify the host on which to bind the server.")
@@ -84,6 +84,11 @@ def daemon_command(octoprint_ctx, pid, host, port, logging, allow_root, debug, c
 		           file=sys.stderr)
 		sys.exit(2)
 
+	if pid is None:
+		click.echo("No path to a pidfile set",
+		           file=sys.stderr)
+		sys.exit(1)
+
 	from octoprint.daemon import Daemon
 	class OctoPrintDaemon(Daemon):
 		def __init__(self, pidfile, basedir, configfile, host, port, debug, allow_root, logging_config, verbosity):