diff --git a/.eslintrc.js b/.eslintrc.js
index adf0fbe01..12d0c9246 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -15,6 +15,7 @@ module.exports = {
 	},
 	extends: [
 		'@nextcloud',
+		'@nextcloud/eslint-config/typescript',
 		'plugin:cypress/recommended',
 	],
 	env: {
diff --git a/package.json b/package.json
index 747f845e0..510a4e5ca 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
     "build": "NODE_ENV=production webpack --progress --config webpack.js",
     "dev": "NODE_ENV=development webpack --progress --config webpack.js",
     "watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
-    "lint": "eslint --ext .js,.vue src",
-    "lint:fix": "eslint --ext .js,.vue src --fix",
+    "lint": "eslint --ext .js,.vue,.ts,.tsx src",
+    "lint:fix": "eslint --ext .js,.vue,.ts,.tsx src --fix",
     "lint:cypress": "eslint --ext .js cypress",
     "stylelint": "stylelint src/**/*.vue src/**/*.scss src/**/*.css css/*.scss",
     "stylelint:fix": "stylelint src/**/*.vue src/**/*.scss src/**/*.css css/*.scss --fix",
diff --git a/tsconfig.json b/tsconfig.json
index 48927d53b..b2f189857 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,9 +9,10 @@
 		"jsx": "react",
 		"allowJs": true
 	},
-	"include": ["src/**/*.tsx"],
+	"include": ["src/**/*.ts", "src/**/*.tsx"],
 	"exclude": [
 		"node_modules",
 		"vendor"
-	]
+	],
+	"typeRoots": ["node_modules/@types", "src/types"]
 }
diff --git a/webpack.js b/webpack.js
index 0478f8c8c..867add40e 100644
--- a/webpack.js
+++ b/webpack.js
@@ -28,13 +28,6 @@ webpackRules.RULE_JS.exclude = BabelLoaderExcludeNodeModulesExcept([
 // Replaces rules array
 webpackConfig.module.rules = Object.values(webpackRules)
 
-// Add typescript rule
-webpackConfig.module.rules.push({
-	test: /\.tsx?$/,
-	use: ['babel-loader', 'ts-loader'],
-	exclude: /node_modules/,
-})
-
 // Raw files rule
 webpackConfig.module.rules.push({
 	resourceQuery: /raw/,