diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
index 69608849d..674ce96a1 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
@@ -60,6 +60,7 @@ import java.util.Arrays;
 import java.util.Set;
 
 import static java.util.Arrays.asList;
+import javax.enterprise.inject.Produces;
 
 /**
  * Abstract base class for code based configuration of Spring managed Neo4j infrastructure.
@@ -252,6 +253,7 @@ public abstract class Neo4jConfiguration {
     @Bean
     @Autowired
     @DependsOn("graphDatabaseService")
+    @Produces
     public GraphDatabase graphDatabase() {
         if (graphDatabaseService instanceof GraphDatabase) return (GraphDatabase) graphDatabaseService;
         return new DelegatingGraphDatabase(graphDatabaseService);