2 files changed, 4 insertions, 3 deletions

diff --git a/server/controllers/tracker.ts b/server/controllers/tracker.ts
index da9c68c6c..6d60639b8 100644
--- a/server/controllers/tracker.ts
+++ b/server/controllers/tracker.ts
@@ -2,7 +2,7 @@ import { Server as TrackerServer } from 'bittorrent-tracker'
 import express from 'express'
 import { createServer } from 'http'
 import proxyAddr from 'proxy-addr'
-import { Server as WebSocketServer } from 'ws'
+import { WebSocketServer } from 'ws'
 import { Redis } from '@server/lib/redis'
 import { logger } from '../helpers/logger'
 import { CONFIG } from '../initializers/config'
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 7f28cfc8b..2cbf0f8fe 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -164,9 +164,10 @@ let rootPath: string
 function root () {
   if (rootPath) return rootPath
 
-  // We are in /helpers/utils.js
-  rootPath = join(__dirname, '..', '..')
+  rootPath = __dirname
 
+  if (basename(rootPath) === 'helpers') rootPath = resolve(rootPath, '..')
+  if (basename(rootPath) === 'server') rootPath = resolve(rootPath, '..')
   if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
 
   return rootPath