diff --git a/lib/services/db/index.js b/lib/services/db/index.js
index 2a6e00fb..f44c6276 100644
--- a/lib/services/db/index.js
+++ b/lib/services/db/index.js
@@ -183,15 +183,10 @@ DB.prototype.stop = function(callback) {
 };
 
 DB.prototype.close = function(callback) {
-
-  var self = this;
-  if (self._store && self._store.isOpen()) {
-    // give the db a grace period to settle out
-    return setTimeout(function() {
-      self._store.close(callback);
-    }, 2000);
+  if(!this._store || this._store.isClosed()){
+    return callback();
   }
-  setImmediate(callback);
+  this._store.close(callback);
 };
 
 DB.prototype.getAPIMethods = function() {