diff --git a/canto_next/fetch.py b/canto_next/fetch.py
index a3d6a10..fefaf9d 100644
--- a/canto_next/fetch.py
+++ b/canto_next/fetch.py
@@ -28,6 +28,7 @@ class CantoFetchThread(PluginHandler, Thread):
     def __init__(self, feed):
         PluginHandler.__init__(self)
         Thread.__init__(self)
+        self.daemon = True
 
         self.plugin_class = DaemonFetchThreadPlugin
         self.update_plugin_lookups()
diff --git a/canto_next/server.py b/canto_next/server.py
index d025c44..e295d0e 100644
--- a/canto_next/server.py
+++ b/canto_next/server.py
@@ -86,6 +86,7 @@ class CantoServer(CantoSocket):
                 Thread(target = self.queue_loop,\
                 args = (conn[0],))))
 
+        self.connections[-1][1].daemon = True
         self.connections[-1][1].start()
         log.debug("Spawned new thread.")