diff --git a/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java b/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
index e1167305686..c6c1ba6f4f2 100644
--- a/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
+++ b/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
@@ -276,10 +276,9 @@ class JaceArchitectOfThoughtEffect3 extends OneShotEffect {
             } else {
                 break;
             }
-            playerList.stream().map((playerId) -> game.getPlayer(playerId)).filter((player) -> (player == null
-                    || !player.canRespond())).forEachOrdered((player) -> {
-                playerList.remove(player.getId());
-            });
+
+            // remove disconnected or quit players
+            playerList.removeIf(playerId -> game.getPlayer(playerId) == null || !game.getPlayer(playerId).canRespond());
         }
         checkList.stream().map((playerId) -> game.getPlayer(playerId)).filter((player) -> (player != null)).forEachOrdered((player) -> {
             player.shuffleLibrary(source, game);