diff --git a/contact-center/app/src/main/java/com/chatopera/cc/config/ElasticsearchConfig.java b/contact-center/app/src/main/java/com/chatopera/cc/config/ElasticsearchConfig.java
new file mode 100644
index 00000000..b6dfa54e
--- /dev/null
+++ b/contact-center/app/src/main/java/com/chatopera/cc/config/ElasticsearchConfig.java
@@ -0,0 +1,21 @@
+package com.chatopera.cc.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.elasticsearch.core.DefaultResultMapper;
+import org.springframework.data.elasticsearch.core.ResultsMapper;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.lang.NonNull;
+
+@Configuration
+public class ElasticsearchConfig {
+
+    @Bean
+    @Primary
+    public ResultsMapper resultsMapper(@NonNull MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
+        return new DefaultResultMapper(mappingContext);
+    }
+}