diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index 2a04a5b9..ffe51c84 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -232,10 +232,11 @@ public class DaemonConnector {
     private DaemonClientConnection connectToCanceledDaemon(Collection<DaemonInfo> busyDaemons,
             DaemonCompatibilitySpec constraint) {
         DaemonClientConnection connection = null;
-        Map<Boolean, List<DaemonInfo>> canceledBusy = busyDaemons.stream()
-                .collect(Collectors.groupingBy(di -> di.getState() == Canceled));
-        final Collection<DaemonInfo> compatibleCanceledDaemons = getCompatibleDaemons(
-                canceledBusy.getOrDefault(true, Collections.emptyList()), constraint);
+        List<DaemonInfo> canceledBusy = busyDaemons.stream()
+                .filter(di -> di.getState() == Canceled)
+                .collect(Collectors.toList());
+        final List<DaemonInfo> compatibleCanceledDaemons = getCompatibleDaemons(
+                canceledBusy, constraint);
         LOGGER.debug("Found {} busy daemons, {} cancelled, {} compatibles", busyDaemons.size(), canceledBusy.size(),
                 compatibleCanceledDaemons.size());
         if (!compatibleCanceledDaemons.isEmpty()) {
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
index 99b38260..1bff4142 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
@@ -508,7 +508,7 @@ public class Server implements AutoCloseable, Runnable {
                         }
                         LOGGER.info("Received message: {}", message);
                         if (message == Message.BareMessage.CANCEL_BUILD_SINGLETON) {
-                            updateState(DaemonState.Canceled);
+                            updateState(Canceled);
                             return;
                         } else {
                             synchronized (recvQueue) {