diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java b/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java
index 55b7d91a4..71bb7b8ad 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java
@@ -18,11 +18,11 @@
 package org.jivesoftware.smack;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import org.jivesoftware.smack.SmackException.NotConnectedException;
@@ -114,17 +114,17 @@ public class ChatManager extends Manager{
     /**
      * Maps thread ID to chat.
      */
-    private Map<String, Chat> threadChats = Collections.synchronizedMap(new HashMap<String, Chat>());
+    private Map<String, Chat> threadChats = new ConcurrentHashMap<>();
 
     /**
      * Maps jids to chats
      */
-    private Map<String, Chat> jidChats = Collections.synchronizedMap(new HashMap<String, Chat>());
+    private Map<String, Chat> jidChats = new ConcurrentHashMap<>();
 
     /**
      * Maps base jids to chats
      */
-    private Map<String, Chat> baseJidChats = Collections.synchronizedMap(new HashMap<String, Chat>());
+    private Map<String, Chat> baseJidChats = new ConcurrentHashMap<>();
 
     private Set<ChatManagerListener> chatManagerListeners
             = new CopyOnWriteArraySet<ChatManagerListener>();