diff --git a/application/Espo/Core/Utils/ClientManager.php b/application/Espo/Core/Utils/ClientManager.php
index 21bda8e938..be18d274f6 100644
--- a/application/Espo/Core/Utils/ClientManager.php
+++ b/application/Espo/Core/Utils/ClientManager.php
@@ -132,7 +132,11 @@ class ClientManager
             $as = $item['as'] ?? '';
             $rel = $item['rel'] ?? '';
             $type = $item['type'] ?? '';
-            $linksHtml .= "\n        <link rel=\"{$rel}\" href=\"{$href}\" as=\"{$as}\" as=\"{$type}\">";
+            $additinalPlaceholder = '';
+            if (empty($item['crossorigin'])) {
+                $additinalPlaceholder .= ' crossorigin';
+            }
+            $linksHtml .= "\n        <link rel=\"{$rel}\" href=\"{$href}\" as=\"{$as}\" as=\"{$type}\"{$additinalPlaceholder}>";
         }
 
         $data = [
diff --git a/application/Espo/Resources/metadata/app/client.json b/application/Espo/Resources/metadata/app/client.json
index 5ce802876b..33c7452951 100644
--- a/application/Espo/Resources/metadata/app/client.json
+++ b/application/Espo/Resources/metadata/app/client.json
@@ -31,14 +31,16 @@
             "as": "font",
             "type": "font/ttf",
             "rel": "preload",
-            "noTimestamp": true
+            "noTimestamp": true,
+            "crossorigin": true
         },
         {
             "href": "client/fonts/open-sans/OpenSans-Regular.ttf",
             "as": "font",
             "type": "font/ttf",
             "rel": "preload",
-            "noTimestamp": true
+            "noTimestamp": true,
+            "crossorigin": true
         }
     ]
 }