diff --git a/lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php b/lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php
index ae46c2438..b09430816 100644
--- a/lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php
+++ b/lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php
@@ -62,12 +62,8 @@ class DefaultRepositoryFactory implements RepositoryFactory
     {
         /* @var $metadata \Doctrine\ORM\Mapping\ClassMetadata */
         $metadata            = $entityManager->getClassMetadata($entityName);
-        $repositoryClassName = $metadata->customRepositoryClassName;
-
-        if (null === $repositoryClassName) {
-            $configuration       = $entityManager->getConfiguration();
-            $repositoryClassName = $configuration->getDefaultRepositoryClassName();
-        }
+        $repositoryClassName = $metadata->customRepositoryClassName
+            ?: $entityManager->getConfiguration()->getDefaultRepositoryClassName();
 
         return new $repositoryClassName($entityManager, $metadata);
     }