diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/AuthEnablementRefreshRequirementProvider.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/AuthEnablementRefreshRequirementProvider.java
index db1bd2e26..2ad60c025 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/AuthEnablementRefreshRequirementProvider.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/AuthEnablementRefreshRequirementProvider.java
@@ -44,9 +44,7 @@ public class AuthEnablementRefreshRequirementProvider implements WebsocketRefres
 
   @VisibleForTesting
   Map<Long, Boolean> buildDevicesEnabledMap(final Account account) {
-    return account.getDevices().stream()
-        .collect(() -> new HashMap<>(account.getDevices().size()),
-            (map, device) -> map.put(device.getId(), device.isEnabled()), HashMap::putAll);
+    return account.getDevices().stream().collect(Collectors.toMap(Device::getId, Device::isEnabled));
   }
 
   @Override