diff --git a/cmd/serve.go b/cmd/serve.go
index 9a3baae86..22deeeb1e 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -108,8 +108,7 @@ func serve() {
 		logger.Fatal("Error initializing service broker config", err)
 	}
 	var serviceBroker domain.ServiceBroker
-	csbStore := storage.New(db, encryptor)
-	serviceBroker, err = osbapiBroker.New(cfg, csbStore, logger)
+	serviceBroker, err = osbapiBroker.New(cfg, storage.New(db, encryptor), logger)
 	if err != nil {
 		logger.Fatal("Error initializing service broker", err)
 	}