diff --git a/api/package.json b/api/package.json
index 39651e85c..8227d139e 100644
--- a/api/package.json
+++ b/api/package.json
@@ -19,7 +19,7 @@
   },
   "scripts": {
     "start": "nodemon src/index.js",
-    "tscheck": "tsc --allowJs --noEmit src/index.js"
+    "ts": "tsc"
   },
   "devDependencies": {
     "nodemon": "^2.0.2",
diff --git a/api/src/controllers/connections.js b/api/src/controllers/connections.js
index be081c755..b7c8b2087 100644
--- a/api/src/controllers/connections.js
+++ b/api/src/controllers/connections.js
@@ -1,8 +1,6 @@
-// @ts-check
 
 const path = require('path');
 const { fork } = require('child_process');
-// @ts-ignore
 const _ = require('lodash');
 const nedb = require('nedb-promises');
 
diff --git a/api/src/controllers/serverConnections.js b/api/src/controllers/serverConnections.js
index ae37849e3..02133c17d 100644
--- a/api/src/controllers/serverConnections.js
+++ b/api/src/controllers/serverConnections.js
@@ -1,3 +1,4 @@
+
 const connections = require('./connections');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
@@ -27,6 +28,7 @@ module.exports = {
       connection,
     };
     this.opened.push(newOpened);
+    // @ts-ignore
     subprocess.on('message', ({ msgtype, ...message }) => {
       this[`handle_${msgtype}`](id, message);
     });
diff --git a/api/src/engines/default/DatabaseAnalyser.js b/api/src/engines/default/DatabaseAnalyser.js
index e5c409068..eab8d43a5 100644
--- a/api/src/engines/default/DatabaseAnalyser.js
+++ b/api/src/engines/default/DatabaseAnalyser.js
@@ -1,4 +1,3 @@
-// @ts-check
 
 class DatabaseAnalyser {
   /**
diff --git a/api/src/engines/mssql/MsSqlAnalyser.js b/api/src/engines/mssql/MsSqlAnalyser.js
index 81bf6d5fc..865cea272 100644
--- a/api/src/engines/mssql/MsSqlAnalyser.js
+++ b/api/src/engines/mssql/MsSqlAnalyser.js
@@ -1,4 +1,3 @@
-// @ts-check
 
 const fs = require('fs-extra');
 const path = require('path');
diff --git a/api/src/engines/mssql/index.js b/api/src/engines/mssql/index.js
index db558b6eb..3d7260ebe 100644
--- a/api/src/engines/mssql/index.js
+++ b/api/src/engines/mssql/index.js
@@ -1,4 +1,5 @@
 const mssql = require('mssql');
+const MsSqlAnalyser = require('./MsSqlAnalyser');
 
 module.exports = {
   async connect({ server, port, user, password }) {
diff --git a/api/src/utility/datadir.js b/api/src/utility/datadir.js
index 52951db41..dce4327d8 100644
--- a/api/src/utility/datadir.js
+++ b/api/src/utility/datadir.js
@@ -1,5 +1,3 @@
-// @ts-check
-
 const os = require('os');
 const path = require('path');
 const fs = require('fs-extra');
diff --git a/api/src/utility/socket.js b/api/src/utility/socket.js
index e02f3d7e1..d252b1f09 100644
--- a/api/src/utility/socket.js
+++ b/api/src/utility/socket.js
@@ -1,5 +1,3 @@
-// @ts-check
-
 let socket = null;
 
 module.exports = {
diff --git a/api/src/utility/useController.js b/api/src/utility/useController.js
index a332af2a9..8fe694058 100644
--- a/api/src/utility/useController.js
+++ b/api/src/utility/useController.js
@@ -1,6 +1,3 @@
-// @ts-check
-
-// @ts-ignore
 const _ = require('lodash');
 const express = require('express');
 
diff --git a/api/tsconfig.json b/api/tsconfig.json
new file mode 100644
index 000000000..83a0e54ea
--- /dev/null
+++ b/api/tsconfig.json
@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "allowJs": true,
+        "checkJs": true,
+        "noEmit": true
+    },
+    "files": [
+        "src/index.js",
+        "src/engines/mssql/index.js",
+        "src/engines/mysql/index.js",
+        "src/engines/postgres/index.js"
+    ]
+}