diff --git a/server/src/headers.ts b/server/src/headers.ts
index dd015a6c66e9c7e5391eabc3ecccb1b8dabb0e28..1361b2791bd983dbf488504cb0d3a1eca1a40510 100644
--- a/server/src/headers.ts
+++ b/server/src/headers.ts
@@ -6,7 +6,11 @@ import { allowedOrigins } from './config';
 export function addDefaultHeaders(req: Request, res: Response, next: NextFunction) {
     const origin = req.header('Origin');
     if (allowedOrigins.includes('*') || origin && allowedOrigins.includes(origin)) {
-        res.header('Access-Control-Allow-Origin', origin);
+        if (origin) {
+            res.header('Access-Control-Allow-Origin', origin);
+        } else {
+            res.header('Access-Control-Allow-Origin', '*');
+        }
         const headers = req.header('Access-Control-Request-Headers');
         if (headers) {
             res.header('Access-Control-Allow-Headers', headers);