diff --git a/src/octoprint/__init__.py b/src/octoprint/__init__.py
index 8cbf5cd6..74ff84a0 100644
--- a/src/octoprint/__init__.py
+++ b/src/octoprint/__init__.py
@@ -129,6 +129,7 @@ def init_logging(settings, use_logging_file=True, logging_file=None, default_con
 		config = default_config
 
 	# configure logging globally
+	import logging.config
 	logging.config.dictConfig(config)
 
 	# make sure we log any warnings
diff --git a/src/octoprint/cli/server.py b/src/octoprint/cli/server.py
index 9be0d924..b697efdd 100644
--- a/src/octoprint/cli/server.py
+++ b/src/octoprint/cli/server.py
@@ -63,8 +63,6 @@ def serve_command(obj, host, port, logging, allow_root):
               help="Specify the port on which to bind the server.")
 @click.option("--logging", type=click.Path(),
               help="Specify the config file to use for configuring logging.")
-@click.option("--debug", "-d", is_flag=True,
-              help="Enable debug mode")
 @click.option("--iknowwhatimdoing", "allow_root", is_flag=True,
               help="Allow OctoPrint to run as user root.")
 @click.argument("command", type=click.Choice(["start", "stop", "restart"]),