diff --git a/couchpotato/core/_base/_core/main.py b/couchpotato/core/_base/_core/main.py
index ec421ac2..0423e666 100644
--- a/couchpotato/core/_base/_core/main.py
+++ b/couchpotato/core/_base/_core/main.py
@@ -176,6 +176,7 @@ class Core(Plugin):
         })
 
     def signalHandler(self):
+        if Env.get('daemonized'): return
 
         def signal_handler(signal, frame):
             fireEvent('app.shutdown')
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
index 2081d117..37152582 100644
--- a/couchpotato/runner.py
+++ b/couchpotato/runner.py
@@ -118,6 +118,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
     Env.set('console_log', options.console_log)
     Env.set('quiet', options.quiet)
     Env.set('desktop', desktop)
+    Env.set('daemonized', options.daemon)
     Env.set('args', args)
     Env.set('options', options)