diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
index 055590447..22b7ef043 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -456,7 +456,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 		} else {
 			query.limit(1);
 			List<T> results = find(query, entityClass, collectionName);
-			return (results.isEmpty() ? null : results.get(0));
+			return results.isEmpty() ? null : results.get(0);
 		}
 	}
 
@@ -879,7 +879,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 			return;
 		}
 
-		remove(getIdQueryFor(object), collection);
+		doRemove(collection, getIdQueryFor(object), object.getClass());
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
index 64d4ea31b..fd18323e8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
@@ -1235,12 +1235,13 @@ public class MongoTemplateTests {
 		String collectionName = "explicit";
 		template.remove(new Query(), collectionName);
 
-		Person person = new Person("Dave");
+		PersonWithConvertedId person = new PersonWithConvertedId();
+		person.name = "Dave";
 		template.save(person, collectionName);
-		assertThat(template.findAll(Person.class, collectionName).isEmpty(), is(false));
+		assertThat(template.findAll(PersonWithConvertedId.class, collectionName).isEmpty(), is(false));
 
 		template.remove(person, collectionName);
-		assertThat(template.findAll(Person.class, collectionName).isEmpty(), is(true));
+		assertThat(template.findAll(PersonWithConvertedId.class, collectionName).isEmpty(), is(true));
 	}
 
 	static class MyId {
@@ -1272,6 +1273,12 @@ public class MongoTemplateTests {
 		}
 	}
 
+	static class PersonWithConvertedId {
+
+		String id;
+		String name;
+	}
+
 	static enum DateTimeToDateConverter implements Converter<DateTime, Date> {
 
 		INSTANCE;