diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java
index 7eb3be1f4..50f7635eb 100644
--- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java
+++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java
@@ -113,7 +113,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<S, ID>,
 	 * @param customImplementation
 	 */
 	public void setCustomImplementation(Object customImplementation) {
-		this.customImplementation = Optional.ofNullable(customImplementation);
+		this.customImplementation = Optional.of(customImplementation);
 	}
 
 	/**
@@ -122,7 +122,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<S, ID>,
 	 * @param repositoryFragments
 	 */
 	public void setRepositoryFragments(RepositoryFragments repositoryFragments) {
-		this.repositoryFragments = Optional.ofNullable(repositoryFragments);
+		this.repositoryFragments = Optional.of(repositoryFragments);
 	}
 
 	/**
@@ -141,7 +141,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<S, ID>,
 	 * @param mappingContext
 	 */
 	protected void setMappingContext(MappingContext<?, ?> mappingContext) {
-		this.mappingContext = Optional.ofNullable(mappingContext);
+		this.mappingContext = Optional.of(mappingContext);
 	}
 
 	/**