diff --git a/client/tsconfig.json b/client/tsconfig.json
index 04923f4e1b..fcf799dd1d 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -5,25 +5,22 @@
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "allowJs": true,
     "skipLibCheck": true,
-    "esModuleInterop": false,
+    "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": false,
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noImplicitAny": false,
-    "noEmit": false,
-    "declaration": true,
-    "declarationDir": "./types",
+    "noEmit": true,
     "jsx": "preserve",
-    "baseUrl": "..",
     "paths": {
-      "~/*": ["./client/src/*"],
-      "test/*": ["./client/test/*"],
-      "*": ["./client/*", "../node_modules/*"],
-      "librechat-data-provider/*": ["./packages/data-provider/*"]
+      "~/*": ["./src/*"],
+      "test/*": ["./test/*"],
+      "*": ["./*", "../../node_modules/*"],
+      "librechat-data-provider/*": ["../packages/data-provider/*"]
     }
   },
   "types": ["node", "jest", "@testing-library/jest-dom"],
diff --git a/config/translations/tsconfig.json b/config/translations/tsconfig.json
index 3d3dd26ca3..13b0ff6c88 100644
--- a/config/translations/tsconfig.json
+++ b/config/translations/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "noImplicitAny": false,
-    "baseUrl": ".",
     "outDir": "./dist",
     "strict": true,
     "moduleResolution": "node",
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
index 55e7e90567..12512cb1fe 100644
--- a/packages/api/tsconfig.json
+++ b/packages/api/tsconfig.json
@@ -18,7 +18,6 @@
     "isolatedModules": true,
     "noEmit": true,
     "sourceMap": true,
-    "baseUrl": ".",
     "paths": {
       "~/*": ["./src/*"]
     }
diff --git a/packages/api/tsconfig.spec.json b/packages/api/tsconfig.spec.json
index f766b118e4..b9f73fedb8 100644
--- a/packages/api/tsconfig.spec.json
+++ b/packages/api/tsconfig.spec.json
@@ -2,8 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "noEmit": true,
-    "outDir": "./dist/tests",
-    "baseUrl": "."
+    "outDir": "./dist/tests"
   },
   "include": ["specs/**/*", "src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index c487529285..bcead085e3 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -16,9 +16,8 @@
     "forceConsistentCasingInFileNames": true,
     "outDir": "./dist",
     "rootDir": "./src",
-    "baseUrl": "./src",
     "paths": {
-      "~/*": ["./*"]
+      "~/*": ["./src/*"]
     },
     "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "resolveJsonModule": true
diff --git a/packages/data-provider/tsconfig.json b/packages/data-provider/tsconfig.json
index 420a848523..bd5c95c16a 100644
--- a/packages/data-provider/tsconfig.json
+++ b/packages/data-provider/tsconfig.json
@@ -18,9 +18,9 @@
     "isolatedModules": true,
     "noEmit": true,
     "sourceMap": true,
-    "baseUrl": ".",
     "paths": {
-      "librechat-data-provider/react-query": ["./src/react-query/index.ts"]
+      "librechat-data-provider/react-query": ["./src/react-query/index.ts"],
+      "src/*": ["./src/*"]
     }
   },
   "exclude": ["node_modules", "dist", "types"],
diff --git a/packages/data-provider/tsconfig.spec.json b/packages/data-provider/tsconfig.spec.json
index f766b118e4..b9f73fedb8 100644
--- a/packages/data-provider/tsconfig.spec.json
+++ b/packages/data-provider/tsconfig.spec.json
@@ -2,8 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "noEmit": true,
-    "outDir": "./dist/tests",
-    "baseUrl": "."
+    "outDir": "./dist/tests"
   },
   "include": ["specs/**/*", "src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/packages/data-schemas/misc/ferretdb/tsconfig.json b/packages/data-schemas/misc/ferretdb/tsconfig.json
index ddd1855bd4..a64965da40 100644
--- a/packages/data-schemas/misc/ferretdb/tsconfig.json
+++ b/packages/data-schemas/misc/ferretdb/tsconfig.json
@@ -4,9 +4,8 @@
     "noEmit": true,
     "target": "ES2020",
     "lib": ["ES2020"],
-    "baseUrl": "../..",
     "paths": {
-      "~/*": ["./src/*"]
+      "~/*": ["../../src/*"]
     }
   },
   "include": ["./**/*.ts"],
diff --git a/packages/data-schemas/tsconfig.json b/packages/data-schemas/tsconfig.json
index b9829ce4e7..cf3f8f740f 100644
--- a/packages/data-schemas/tsconfig.json
+++ b/packages/data-schemas/tsconfig.json
@@ -12,7 +12,6 @@
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true,
     "sourceMap": true,
-    "baseUrl": ".",
     "paths": {
       "~/*": ["./src/*"]
     }
diff --git a/packages/data-schemas/tsconfig.spec.json b/packages/data-schemas/tsconfig.spec.json
index f766b118e4..b9f73fedb8 100644
--- a/packages/data-schemas/tsconfig.spec.json
+++ b/packages/data-schemas/tsconfig.spec.json
@@ -2,8 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "noEmit": true,
-    "outDir": "./dist/tests",
-    "baseUrl": "."
+    "outDir": "./dist/tests"
   },
   "include": ["specs/**/*", "src/**/*"],
   "exclude": ["node_modules", "dist"]