diff --git a/server/src/http-interfaces.ts b/server/src/http-interfaces.ts
index 808878950..d1d64db01 100644
--- a/server/src/http-interfaces.ts
+++ b/server/src/http-interfaces.ts
@@ -63,7 +63,7 @@ export class HttpResponseImpl implements HttpResponse {
 
         // prefer etag
         this.res.sendFile(filePath, {
-            root: null,
+            root: undefined,
             dotfiles: 'allow',
             cacheControl: false,
         });
diff --git a/server/src/promise-utils.ts b/server/src/promise-utils.ts
index 8f5fa27ea..29de7efae 100644
--- a/server/src/promise-utils.ts
+++ b/server/src/promise-utils.ts
@@ -1,5 +1,5 @@
 export interface RefreshPromise<T> {
-    promise: Promise<T>;
+    promise: Promise<T> | undefined;
     cacheDuration: number;
 }
 
@@ -66,12 +66,12 @@ export function timeoutFunction<T>(timeout: number, f: (isTimedOut: () => boolea
 }
 
 export function createPromiseDebouncer<T>() {
-    let current: Promise<T>;
+    let current: Promise<T> | undefined;
 
     return (func: () => Promise<T>): Promise<T> => {
         if (!current)
-            current = func().finally(() => current = undefined);
-        return current;
+            current = func().finally(() => current = undefined as unknown as Promise<T>);
+        return current!;
     }
 }