diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java b/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
index d05cc24..b2b0c49 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
@@ -133,7 +133,8 @@ public class KillbillServerModule extends KillbillPlatformModule {
@Override
protected void configureEmbeddedDB() {
- bind(EmbeddedDB.class).toProvider(KillBillEmbeddedDBProvider.class).asEagerSingleton();
+ embeddedDB = new KillBillEmbeddedDBProvider(daoConfig).get();
+ bind(EmbeddedDB.class).toInstance(embeddedDB);
}
@Override