diff --git a/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt b/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
index 8daabe60b7..a4947cb738 100644
--- a/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
+++ b/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
@@ -21,6 +21,7 @@ package org.springframework.data.repository
  * @param id the entity id.
  * @return the entity with the given id or `null` if none found
  * @author Sebastien Deleuze
+ * @author Oscar Hernandez
  * @since 2.1.4
  */
-fun <T, ID> CrudRepository<T, ID>.findByIdOrNull(id: ID): T? = findById(id!!).orElse(null)
+fun <T, ID: Any> CrudRepository<T, ID>.findByIdOrNull(id: ID): T? = findById(id).orElse(null)