diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java b/core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java
index 1d70d3d37..35ac43d09 100644
--- a/core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java
+++ b/core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java
@@ -537,7 +537,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
             return;
         }
 
-        for (ChatRoom chatRoom : new ArrayList<>(chatRoomList)) {
+        for (ChatRoom chatRoom : chatRoomList) {
             closeTab(chatRoom);
             chatRoom.closeChatRoom();
         }
@@ -1475,7 +1475,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
     }
 
     public void closeAllGroupChatRooms() {
-        for (ChatRoom chatRoom : new ArrayList<>(chatRoomList)) {
+        for (ChatRoom chatRoom : chatRoomList) {
             boolean isGroup = chatRoom.getChatType() == Message.Type.groupchat;
             if (isGroup) {
                 closeTab(chatRoom);
@@ -1485,7 +1485,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
     }
 
     public boolean hasGroupChatRooms() {
-        for (ChatRoom chatRoom : new ArrayList<>(chatRoomList)) {
+        for (ChatRoom chatRoom : chatRoomList) {
             boolean isGroup = chatRoom.getChatType() == Message.Type.groupchat;
             if (isGroup) {
                 return true;