diff --git a/deluge/core/core.py b/deluge/core/core.py
index afd938b2a..cdf219004 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -180,6 +180,7 @@ class Core(
             self._on_alert_torrent_paused)
         
         t = threading.Thread(target=self.serve_forever)
+        t.setDaemon(True)
         t.start()
         gobject.threads_init()