diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt
index 101c1a98..f79dc7af 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/watcher/InputDirectoryWatcher.kt
@@ -74,10 +74,12 @@ class InputDirectoryWatcher(@Autowired var coordinator: Coordinator): FileWatche
                 e.printStackTrace()
             }
         }
-        log.warn { "Watcher stopped!!!" }
-        if (!isStopping) {
-            ioCoroutine.launch {
-                watchFiles()
+        watcherChannel.invokeOnClose {
+            log.warn { "Watcher stopped!!!" }
+            if (!isStopping) {
+                ioCoroutine.launch {
+                    watchFiles()
+                }
             }
         }
     }