diff --git a/libs/event-emitter/src/couchdb-datasources/issues.ts b/libs/event-emitter/src/couchdb-datasources/issues.ts
index c9d4ada..745131c 100644
--- a/libs/event-emitter/src/couchdb-datasources/issues.ts
+++ b/libs/event-emitter/src/couchdb-datasources/issues.ts
@@ -12,15 +12,14 @@ export class Issues {
   private static issuesDb = null;
   private static initialized = false;
 
-  static async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.Issue> | null> {
+  static async getDatasource(): Promise<
+    nano.DocumentScope<RedmineTypes.Issue>
+  > {
     if (Issues.initialized) {
       return Issues.issuesDb;
     }
     Issues.initialized = true;
     const n = CouchDb.getCouchDb();
-    if (!n) {
-      return null;
-    }
     const issueDbName = config.couchDb?.dbs.issues || 'issues';
     const dbs = await n.db.list();
     if (!dbs.includes(issueDbName)) {
@@ -30,4 +29,8 @@ export class Issues {
     Issues.logger.log(`Connected to issues db - ${issueDbName}`);
     return Issues.issuesDb;
   }
+
+  async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.Issue>> {
+    return await Issues.getDatasource();
+  }
 }
diff --git a/libs/event-emitter/src/couchdb-datasources/users.ts b/libs/event-emitter/src/couchdb-datasources/users.ts
index 8f06d2a..1fad236 100644
--- a/libs/event-emitter/src/couchdb-datasources/users.ts
+++ b/libs/event-emitter/src/couchdb-datasources/users.ts
@@ -12,15 +12,12 @@ export class Users {
   private static usersDb = null;
   private static initialized = false;
 
-  static async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.User> | null> {
+  static async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.User>> {
     if (Users.initialized) {
       return Users.usersDb;
     }
     Users.initialized = true;
     const n = CouchDb.getCouchDb();
-    if (!n) {
-      return null;
-    }
     const usersDbName = config.couchDb?.dbs.users;
     const dbs = await n.db.list();
     if (!dbs.includes(usersDbName)) {
@@ -30,4 +27,8 @@ export class Users {
     Users.logger.log(`Connected to users db - ${usersDbName}`);
     return Users.usersDb;
   }
+
+  async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.User>> {
+    return await Users.getDatasource();
+  }
 }