diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java
index eb91c2d34..a2b2dbe3c 100644
--- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java
@@ -722,13 +722,10 @@ public class MappingRelationalConverter extends AbstractRelationalConverter
 
 		if (getMappingContext().hasPersistentEntityFor(value.getClass())) {
 
-			RelationalPersistentEntity<?> persistentEntity = getMappingContext().getPersistentEntity(value.getClass());
-
-			if (persistentEntity != null) {
+			RelationalPersistentEntity<?> persistentEntity = getMappingContext().getRequiredPersistentEntity(value.getClass());
 
 				Object id = persistentEntity.getIdentifierAccessor(value).getIdentifier();
 				return writeValue(id, type);
-			}
 		}
 
 		return getConversionService().convert(value, type.getType());