diff --git a/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java b/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java index 01eded126079d..280593e5df9e3 100644 --- a/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java +++ b/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java @@ -505,7 +505,9 @@ protected Set getAvailableNodes() { readLock.lock(); try { return model.getSnapshot().stream() - .filter(node -> !DOWN.equals(node.getAvailability())) + .filter( + node -> + !DOWN.equals(node.getAvailability()) && !DRAINING.equals(node.getAvailability())) .collect(toImmutableSet()); } finally { readLock.unlock();