diff --git a/cesium-plus-pod-core/src/main/java/org/duniter/elasticsearch/service/changes/ChangeService.java b/cesium-plus-pod-core/src/main/java/org/duniter/elasticsearch/service/changes/ChangeService.java
index 5f6be682b39efde3799e8ecc82e4f5178967411b..d969c5bb2f479546e817c5399a85cc4ff0963975 100644
--- a/cesium-plus-pod-core/src/main/java/org/duniter/elasticsearch/service/changes/ChangeService.java
+++ b/cesium-plus-pod-core/src/main/java/org/duniter/elasticsearch/service/changes/ChangeService.java
@@ -52,6 +52,7 @@ import org.elasticsearch.indices.IndicesService;
 import org.joda.time.DateTime;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class ChangeService {
 
@@ -65,10 +66,10 @@ public class ChangeService {
 
     private final ESLogger log = Loggers.getLogger(ChangeService.class);
 
-    private static final Map<String, ChangeListener> LISTENERS = new HashMap<>();
+    private static final Map<String, ChangeListener> LISTENERS = new ConcurrentHashMap<>();
 
-    private static Map<String, ChangeSource> LISTENERS_SOURCES = new HashMap<>();
-    private static Map<String, Integer> LISTENERS_SOURCES_USAGE_COUNT = new HashMap<>();
+    private static Map<String, ChangeSource> LISTENERS_SOURCES = new ConcurrentHashMap<>();
+    private static Map<String, Integer> LISTENERS_SOURCES_USAGE_COUNT = new ConcurrentHashMap<>();
 
     @Inject
     public ChangeService(final Settings settings, IndicesService indicesService) {
diff --git a/cesium-plus-pod-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java b/cesium-plus-pod-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
index 71d059d631678e3eca510cf220b2f10e4730ef3b..f77a223da9348c7d8a1b053f144dfce2ca6c697a 100644
--- a/cesium-plus-pod-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
+++ b/cesium-plus-pod-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
@@ -59,6 +59,7 @@ import org.elasticsearch.search.sort.SortOrder;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -76,7 +77,7 @@ public class UserEventService extends AbstractService implements ChangeService.C
     public static final String INDEX = "user";
     public static final String EVENT_TYPE = "event";
 
-    private static final Map<String, UserEventListener> LISTENERS = new HashMap<>();
+    private static final Map<String, UserEventListener> LISTENERS = new ConcurrentHashMap<>();
 
     private static final List<ChangeSource> CHANGE_LISTEN_SOURCES = ImmutableList.of(new ChangeSource(INDEX, EVENT_TYPE));