diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 9554b9f462..9a4e858a51 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -497,9 +497,9 @@ namespace Emby.Server.Implementations.HttpServer
                     var requestInnerEx = GetActualException(requestEx);
                     var statusCode = GetStatusCode(requestInnerEx);
 
-                    if (!httpRes.Headers.ContainsKey("Access-Control-Allow-Origin"))
+                    foreach (var (key, value) in GetDefaultCorsHeaders(httpReq))
                     {
-                        httpRes.Headers.Add("Access-Control-Allow-Origin", "*");
+                        httpRes.Headers.Add(key, value);
                     }
 
                     bool ignoreStackTrace =