diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
index d9dd171f2..592046bdd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
@@ -1284,10 +1284,14 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 
 		if (conversions.isSimpleType(obj.getClass())) {
 
-			Class<?> conversionTargetType = Object.class;
-			if(typeInformation != null && conversions.isSimpleType(typeInformation.getType())) {
+			Class<?> conversionTargetType;
+
+			if (typeInformation != null && conversions.isSimpleType(typeInformation.getType())) {
 				conversionTargetType = typeInformation.getType();
+			} else {
+				conversionTargetType = Object.class;
 			}
+
 			return getPotentiallyConvertedSimpleWrite(obj, conversionTargetType);
 		}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java
index d33ac9d7b..0a623dd78 100755
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java
@@ -989,7 +989,7 @@ public class QueryMapperUnitTests {
 	}
 
 	@Test // DATAMONGO-2517
-	public void shouldParseNestedKeywordWithArgumentMatchingTheSourceEntitiesConstructorCorrectly() {
+	void shouldParseNestedKeywordWithArgumentMatchingTheSourceEntitiesConstructorCorrectly() {
 
 		TextQuery source = new TextQuery("test");