diff --git a/marconi/cmd/server.py b/marconi/cmd/server.py
index 0a59cc65a..298feb2f7 100644
--- a/marconi/cmd/server.py
+++ b/marconi/cmd/server.py
@@ -35,8 +35,8 @@ def run():
     # run under devstack, but it may also be useful for other scenarios.
     # Open /dev/zero and /dev/null for redirection.
     # Daemonizing marconi-server is needed *just* when running under devstack
-    # and when `USE_SCREEN` is set to False.
-    if os.environ.get('USE_SCREEN', '').lower() == 'false':
+    # and when marconi is invoked with `daemon` command line option.
+    if conf.daemon:
         zerofd = os.open('/dev/zero', os.O_RDONLY)
         nullfd = os.open('/dev/null', os.O_WRONLY)
 
diff --git a/marconi/queues/bootstrap.py b/marconi/queues/bootstrap.py
index f7f9fe7bb..5aa59a4b9 100644
--- a/marconi/queues/bootstrap.py
+++ b/marconi/queues/bootstrap.py
@@ -27,6 +27,16 @@ from marconi.queues import transport  # NOQA
 
 LOG = log.getLogger(__name__)
 
+_CLI_OPTIONS = (
+    cfg.BoolOpt('daemon', default=False,
+                help='Run Marconi server in background.'),
+)
+
+# NOTE (Obulpathi): Register daemon command line option for
+# marconi-server
+CONF = cfg.CONF
+CONF.register_cli_opts(_CLI_OPTIONS)
+
 _GENERAL_OPTIONS = (
     cfg.BoolOpt('sharding', default=False,
                 help=('Enable sharding across multiple storage backends. ',