diff --git a/core/src/main/groovy/com/muwire/core/files/DirectoryWatcher.groovy b/core/src/main/groovy/com/muwire/core/files/DirectoryWatcher.groovy
index 295e7557..ca97b10b 100644
--- a/core/src/main/groovy/com/muwire/core/files/DirectoryWatcher.groovy
+++ b/core/src/main/groovy/com/muwire/core/files/DirectoryWatcher.groovy
@@ -23,6 +23,7 @@ class DirectoryWatcher {
     DirectoryWatcher(EventBus eventBus) {
         this.eventBus = eventBus
         this.watcherThread = new Thread({watch() } as Runnable, "directory-watcher")
+        watcherThread.setDaemon(true)
     }
     
     void start() {