diff --git a/base/server.mjs b/base/server.mjs
index 56bd9f8..5b25fcf 100644
--- a/base/server.mjs
+++ b/base/server.mjs
@@ -14,6 +14,7 @@ export default class Server {
     this.http = http
     this.port = port
     this.core = core
+    this.pool = null
 
     this.flaskaOptions = {
       appendHeaders: {
@@ -43,7 +44,7 @@ export default class Server {
     this.flaska = new Flaska(this.flaskaOptions, this.http)
 
     // Create our database pool
-    let pool = this.runCreateDatabase()
+    this.runCreateDatabase()
 
     // configure our server
     if (config.get('NODE_ENV') === 'development') {
@@ -56,8 +57,8 @@ export default class Server {
       ctx.log = ctx.log.child({
         id: Math.random().toString(36).substring(2, 14),
       })
-      ctx.db = pool
-    })
+      ctx.db = this.pool
+    }.bind(this))
     this.flaska.before(QueryHandler())
     
     let healthChecks = 0
@@ -109,7 +110,7 @@ export default class Server {
 
   runCreateDatabase() {
     return import('./db.mjs').then(db => {
-      return db.initPool(this.core, config.get('mssql'))
+      this.pool = db.initPool(this.core, config.get('mssql'))
     })
   }
 
diff --git a/nfp_moe/package.json b/nfp_moe/package.json
index f005e46..94cfd52 100644
--- a/nfp_moe/package.json
+++ b/nfp_moe/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nfp_moe",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "port": 4110,
   "description": "NFP Moe website",
   "main": "index.js",