diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index d943d12db4012e41800ea0ff9927fa402a56ee12..fe38ae4515f67980dfb3b71a167847c61532e1d0 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -652,7 +652,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public void refreshCapsFor(Contact contact) {
-        for (final var k : gateways.keySet()) {
+        for (final var k : new HashSet<>(gateways.keySet())) {
             gateways.remove(k, contact);
         }
         for (final var p : contact.getPresences().getPresences()) {