diff --git a/package-lock.json b/package-lock.json
index c8555e4..d1bd516 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "@hapiness/mongo",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index 50e2209..e2e1d63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hapiness/mongo",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "description": "Hapiness Module for MongoDB usage",
     "main": "commonjs/index.js",
     "types": "index.d.ts",
diff --git a/src/module/adapters/hapiness-mongo-adapter.ts b/src/module/adapters/hapiness-mongo-adapter.ts
index acc07dc..ca3f0b7 100644
--- a/src/module/adapters/hapiness-mongo-adapter.ts
+++ b/src/module/adapters/hapiness-mongo-adapter.ts
@@ -136,7 +136,7 @@ export class HapinessMongoAdapter extends EventEmitter {
         this.emit('disconnected', { uri: this._uri });
 
         if (this._isClosed) {
-            return;
+            return Observable.of(null);
         }
 
         return this