diff --git a/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
index 0a183cd5e..b8b9813f8 100644
--- a/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
+++ b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
@@ -165,10 +165,8 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker {
 
 		Method method = methods.getDeleteMethod()
 				.orElseThrow(() -> new IllegalStateException("Repository doesn't have a delete-method declared!"));
-		Class<?> parameterType = method.getParameterTypes()[0];
-		List<Class<?>> idTypes = Arrays.asList(idType, Object.class);
 
-		if (idTypes.contains(parameterType)) {
+		if (method.getName().endsWith("ById")) {
 			invoke(method, convertId(id));
 		} else {
 			invoke(method, this.<Object> invokeFindById(id).orElse(null));
diff --git a/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java b/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java
index 15cdb4cee..73f91d7ed 100755
--- a/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/support/ReflectionRepositoryInvokerUnitTests.java
@@ -272,6 +272,28 @@ public class ReflectionRepositoryInvokerUnitTests {
 		});
 	}
 
+	@Test // DATACMNS-1277
+	public void invokesFindByIdBeforeDeletingOnOverride() {
+
+		DeleteByEntityOverrideSubRepository mock = mock(DeleteByEntityOverrideSubRepository.class);
+		doReturn(Optional.of(new Domain())).when(mock).findById(any());
+
+		getInvokerFor(mock).invokeDeleteById(1L);
+
+		verify(mock).findById(1L);
+		verify(mock).delete(any(Domain.class));
+	}
+
+	@Test // DATACMNS-1277
+	public void invokesDeleteByIdOnOverride() {
+
+		DeleteByIdOverrideSubRepository mock = mock(DeleteByIdOverrideSubRepository.class);
+
+		getInvokerFor(mock).invokeDeleteById(1L);
+
+		verify(mock).deleteById(1L);
+	}
+
 	private static RepositoryInvoker getInvokerFor(Object repository) {
 
 		RepositoryMetadata metadata = new DefaultRepositoryMetadata(repository.getClass().getInterfaces()[0]);
@@ -336,4 +358,19 @@ public class ReflectionRepositoryInvokerUnitTests {
 
 		com.google.common.base.Optional<Domain> findById(Long id);
 	}
+
+	// DATACMNS-1277
+	interface DeleteByEntityOverrideRepository<T, ID> extends CrudRepository<T, ID> {
+		@Override
+		void delete(T entity);
+	}
+
+	interface DeleteByEntityOverrideSubRepository extends DeleteByEntityOverrideRepository<Domain, Long> {}
+
+	// DATACMNS-1277
+	interface DeleteByIdOverrideRepository<T, ID> extends Repository<T, ID> {
+		void deleteById(ID entity);
+	}
+
+	interface DeleteByIdOverrideSubRepository extends DeleteByIdOverrideRepository<Domain, Long> {}
 }