diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatchTask.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatchTask.java
index 289a0a2595..158e1e6354 100644
--- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatchTask.java
+++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatchTask.java
@@ -88,8 +88,11 @@ public final Void call() throws IOException
             try
             {
                 final WatchKey key = watcher.take();
-                final Path watchable = (Path) key.watchable();
-                onPathChanged(watchable);
+                if (key != null)
+                {
+                    final Path watchable = (Path) key.watchable();
+                    onPathChanged(watchable);
+                }
             }
             catch (InterruptedException ex)
             {
diff --git a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatcher.java b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatcher.java
index cc91596f90..b37104f8f8 100644
--- a/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatcher.java
+++ b/runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/watcher/EngineConfigWatcher.java
@@ -146,9 +146,7 @@ private WatchKey registerImpl(
     private WatchKey takeImpl() throws InterruptedException
     {
         WatchKey watchKey = watcher.take();
-        CompoundWatchKey compoundKey = compoundKeys.get(watchKey);
-
-        return compoundKey;
+        return compoundKeys.get(watchKey);
     }
 
     private final class CompoundWatchKey implements WatchKey