diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index a74a7224b..896aaf874 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -288,11 +288,16 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 	 * @return
 	 */
 	protected E addPersistentEntity(TypeInformation<?> typeInformation) {
+		
+		try {
+			read.lock();
+			E persistentEntity = persistentEntities.get(typeInformation);
 
-		E persistentEntity = persistentEntities.get(typeInformation);
-
-		if (persistentEntity != null) {
-			return persistentEntity;
+			if (persistentEntity != null) {
+				return persistentEntity;
+			}
+		} finally {
+			read.unlock();
 		}
 
 		Class<?> type = typeInformation.getType();