diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java
index dc2949f9d1..950b9ab318 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java
@@ -116,6 +116,9 @@ public SimpleTypeHolder(Set<? extends Class<?>> customSimpleTypes, SimpleTypeHol
 	 */
 	public boolean isSimpleType(Class<?> type) {
 		Assert.notNull(type);
+		if (Object.class.equals(type)) {
+			return true;
+		}		
 		for (Class<?> clazz : simpleTypes) {
 			if (type == clazz || clazz.isAssignableFrom(type)) {
 				return true;
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
index 49c93fbb1f..624ebba289 100644
--- a/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
@@ -86,4 +86,10 @@ public void createsHolderFromAnotherOneCorrectly() {
 		assertThat(second.isSimpleType(SimpleTypeHolder.class), is(true));
 		assertThat(second.isSimpleType(SimpleTypeHolderUnitTests.class), is(true));
 	}
+
+	@Test
+	public void considersObjectToBeSimpleType() {
+		SimpleTypeHolder holder = new SimpleTypeHolder();
+		assertThat(holder.isSimpleType(Object.class), is(true));
+	}
 }