diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/MappingInfrastructureFactoryBean.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/MappingInfrastructureFactoryBean.java
index 4a82fb9f3..8184f49f5 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/MappingInfrastructureFactoryBean.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/MappingInfrastructureFactoryBean.java
@@ -107,6 +107,9 @@ public class MappingInfrastructureFactoryBean implements FactoryBean<Infrastruct
         if (this.graphDatabaseService == null && graphDatabase instanceof DelegatingGraphDatabase) {
             this.graphDatabaseService = ((DelegatingGraphDatabase) graphDatabase).getGraphDatabaseService();
         }
+        if (this.graphDatabase == null && graphDatabaseService instanceof GraphDatabase) {
+            this.graphDatabase = (GraphDatabase)graphDatabaseService;
+        }
         if (this.graphDatabase == null) {
             this.graphDatabase = new DelegatingGraphDatabase(graphDatabaseService);
         }