diff --git a/server/src/models/Model.js b/server/src/models/Model.js
index fdd8dd9b0..d3eeaa5d5 100644
--- a/server/src/models/Model.js
+++ b/server/src/models/Model.js
@@ -7,14 +7,6 @@ import DateSession from 'models/DateSession';
 export default class ModelBase extends mixin(Model, [DateSession]) {
 
 
-  static query(...args) {
-    return super.query(...args).onBuildKnex(knexQueryBuilder => {
-      knexQueryBuilder.on('query', queryData => {
-        console.log(queryData);
-      });
-    });
-  }
-
   get timestamps() {
     return [];
   }
diff --git a/server/src/models/TenantModel.js b/server/src/models/TenantModel.js
index 383921ece..ed4301e4f 100644
--- a/server/src/models/TenantModel.js
+++ b/server/src/models/TenantModel.js
@@ -1,5 +1,21 @@
+import { Container } from 'typedi';
 import BaseModel from 'models/Model';
 
 export default class TenantModel extends BaseModel {
+  /**
+   * Logging all tenant databases queries.
+   * @param  {...any} args 
+   */
+  static query(...args) {
+    const Logger = Container.get('logger');
+    return super.query(...args).onBuildKnex(knexQueryBuilder => {
+      const { userParams: { tenantId } } = knexQueryBuilder.client.config;
 
+      knexQueryBuilder.on('query', queryData => {
+        Logger.info(`[query][tenant] ${queryData.sql}`, {
+          bindings: queryData.bindings, tenantId
+        });
+      });
+    });
+  }
 }
diff --git a/server/src/system/models/SystemModel.js b/server/src/system/models/SystemModel.js
index 5e599b6be..cba8eea01 100644
--- a/server/src/system/models/SystemModel.js
+++ b/server/src/system/models/SystemModel.js
@@ -1,5 +1,19 @@
+import { Container } from 'typedi';
 import BaseModel from 'models/Model';
 
 export default class SystemModel extends BaseModel{
-
+  /**
+   * Loging all system database queries.
+   * @param  {...any} args 
+   */
+  static query(...args) {
+    const Logger = Container.get('logger');
+    return super.query(...args).onBuildKnex(knexQueryBuilder => {
+      knexQueryBuilder.on('query', queryData => {
+        Logger.info(`[query][system] ${queryData.sql}`, {
+          bindings: queryData.bindings,
+        });
+      });
+    });
+  }
 }
\ No newline at end of file