diff --git a/src/Umbraco.Core/Constants-HealthChecks.cs b/src/Umbraco.Core/Constants-HealthChecks.cs
index 2980a5945719..875f86cb4c70 100644
--- a/src/Umbraco.Core/Constants-HealthChecks.cs
+++ b/src/Umbraco.Core/Constants-HealthChecks.cs
@@ -45,7 +45,6 @@ public static class Security
                 public const string ClickJackingCheck = "https://umbra.co/healthchecks-click-jacking";
                 public const string HstsCheck = "https://umbra.co/healthchecks-hsts";
                 public const string NoSniffCheck = "https://umbra.co/healthchecks-no-sniff";
-                public const string XssProtectionCheck = "https://umbra.co/healthchecks-xss-protection";
                 public const string ExcessiveHeadersCheck = "https://umbra.co/healthchecks-excessive-headers";
 
                 public static class HttpsCheck
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
index 0f90e815a002..19147759e66a 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml
@@ -2358,9 +2358,13 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="hSTSCheckHeaderNotFoundOnLocalhost">
       <![CDATA[The header <strong>Strict-Transport-Security</strong> was not found. This header should not be present on localhost.]]>
     </key>
-    <key alias="xssProtectionCheckHeaderFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was found.]]></key>
+    <key alias="xssProtectionCheckHeaderFound">
+      <![CDATA[The header <strong>X-XSS-Protection</strong> was found. <strong>It is recommended not to add this header to your website</strong>.<br />
+    You can read about this on the <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection" target="_blank" rel="noopener" class="btn-link -underline">Mozilla</a> website ]]>
+    </key>
     <key alias="xssProtectionCheckHeaderNotFound">
-      <![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]></key>
+      <![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]>
+    </key>
     <!-- The following key get these tokens passed in:
 	    0: Comma delimitted list of headers found
   	-->
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
index 5acf1b7abef1..67da5429bdb8 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
@@ -2461,7 +2461,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="hSTSCheckHeaderNotFoundOnLocalhost">
       <![CDATA[The header <strong>Strict-Transport-Security</strong> was not found. This header should not be present on localhost.]]>
     </key>
-    <key alias="xssProtectionCheckHeaderFound"><![CDATA[The header <strong>X-XSS-Protection</strong> was found.]]></key>
+    <key alias="xssProtectionCheckHeaderFound">
+      <![CDATA[The header <strong>X-XSS-Protection</strong> was found. <strong>It is recommended not to add this header to your website</strong>.<br />
+    You can read about this on the <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection" target="_blank" rel="noopener" class="btn-link -underline">Mozilla</a> website ]]></key>
     <key alias="xssProtectionCheckHeaderNotFound">
       <![CDATA[The header <strong>X-XSS-Protection</strong> was not found.]]></key>
     <!-- The following key get these tokens passed in:
diff --git a/src/Umbraco.Core/HealthChecks/Checks/Security/BaseHttpHeaderCheck.cs b/src/Umbraco.Core/HealthChecks/Checks/Security/BaseHttpHeaderCheck.cs
index 9a0ecf57ae41..40c5c0d87a21 100644
--- a/src/Umbraco.Core/HealthChecks/Checks/Security/BaseHttpHeaderCheck.cs
+++ b/src/Umbraco.Core/HealthChecks/Checks/Security/BaseHttpHeaderCheck.cs
@@ -18,6 +18,7 @@ public abstract class BaseHttpHeaderCheck : HealthCheck
     private readonly IHostingEnvironment _hostingEnvironment;
     private readonly string _localizedTextPrefix;
     private readonly bool _metaTagOptionAvailable;
+    private readonly bool _shouldNotExist;
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="BaseHttpHeaderCheck" /> class.
@@ -27,13 +28,15 @@ protected BaseHttpHeaderCheck(
         ILocalizedTextService textService,
         string header,
         string localizedTextPrefix,
-        bool metaTagOptionAvailable)
+        bool metaTagOptionAvailable,
+        bool shouldNotExist = false)
     {
         LocalizedTextService = textService ?? throw new ArgumentNullException(nameof(textService));
         _hostingEnvironment = hostingEnvironment;
         _header = header;
         _localizedTextPrefix = localizedTextPrefix;
         _metaTagOptionAvailable = metaTagOptionAvailable;
+        _shouldNotExist = shouldNotExist;
     }
 
     [Obsolete("Save ILocalizedTextService in a field on the super class instead of using this")]
@@ -42,7 +45,7 @@ protected BaseHttpHeaderCheck(
     /// <summary>
     ///     Gets a link to an external read more page.
     /// </summary>
-    protected abstract string ReadMoreLink { get; }
+    protected abstract string? ReadMoreLink { get; }
 
     private static HttpClient HttpClient => httpClient ??= new HttpClient();
 
@@ -66,6 +69,7 @@ protected async Task<HealthCheckStatus> CheckForHeader()
     {
         string message;
         var success = false;
+        StatusResultType resultType = StatusResultType.Warning;
 
         // Access the site home page and check for the click-jack protection header or meta tag
         var url = _hostingEnvironment.ApplicationMainUrl?.GetLeftPart(UriPartial.Authority);
@@ -86,6 +90,16 @@ protected async Task<HealthCheckStatus> CheckForHeader()
             message = success
                 ? LocalizedTextService.Localize("healthcheck", $"{_localizedTextPrefix}CheckHeaderFound")
                 : LocalizedTextService.Localize("healthcheck", $"{_localizedTextPrefix}CheckHeaderNotFound");
+
+            if (_shouldNotExist)
+            {
+
+                resultType = success ? StatusResultType.Error : StatusResultType.Success;
+            }
+            else
+            {
+                resultType = success ?  StatusResultType.Success : StatusResultType.Error;
+            }
         }
         catch (Exception ex)
         {
@@ -95,8 +109,8 @@ protected async Task<HealthCheckStatus> CheckForHeader()
         return
             new HealthCheckStatus(message)
             {
-                ResultType = success ? StatusResultType.Success : StatusResultType.Error,
-                ReadMoreLink = success ? null : ReadMoreLink,
+                ResultType = resultType,
+                ReadMoreLink = success && !string.IsNullOrEmpty(ReadMoreLink) ? null : ReadMoreLink,
             };
     }
 
diff --git a/src/Umbraco.Core/HealthChecks/Checks/Security/XssProtectionCheck.cs b/src/Umbraco.Core/HealthChecks/Checks/Security/XssProtectionCheck.cs
index ca988fe45af2..d218baad8f8a 100644
--- a/src/Umbraco.Core/HealthChecks/Checks/Security/XssProtectionCheck.cs
+++ b/src/Umbraco.Core/HealthChecks/Checks/Security/XssProtectionCheck.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Cms.Core.HealthChecks.Checks.Security;
 [HealthCheck(
     "F4D2B02E-28C5-4999-8463-05759FA15C3A",
     "Cross-site scripting Protection (X-XSS-Protection header)",
-    Description = "This header enables the Cross-site scripting (XSS) filter in your browser. It checks for the presence of the X-XSS-Protection-header.",
+    Description = "This checks for the presence of the X-XSS-Protection-header.",
     Group = "Security")]
 public class XssProtectionCheck : BaseHttpHeaderCheck
 {
@@ -20,17 +20,14 @@ public class XssProtectionCheck : BaseHttpHeaderCheck
     ///     Initializes a new instance of the <see cref="XssProtectionCheck" /> class.
     /// </summary>
     /// <remarks>
-    ///     The check is mostly based on the instructions in the OWASP CheatSheet
-    ///     (https://www.owasp.org/index.php/HTTP_Strict_Transport_Security_Cheat_Sheet)
-    ///     and the blog post of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/)
-    ///     If you want do to it perfectly, you have to submit it https://hstspreload.appspot.com/,
-    ///     but then you should include subdomains and I wouldn't suggest to do that for Umbraco-sites.
+    ///     This check should not find the header in newer browsers as this can cause security vulnerabilities
+    ///     https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
     /// </remarks>
     public XssProtectionCheck(IHostingEnvironment hostingEnvironment, ILocalizedTextService textService)
-        : base(hostingEnvironment, textService, "X-XSS-Protection", "xssProtection", true)
+        : base(hostingEnvironment, textService, "X-XSS-Protection", "xssProtection", true, true)
     {
     }
 
     /// <inheritdoc />
-    protected override string ReadMoreLink => Constants.HealthChecks.DocumentationLinks.Security.XssProtectionCheck;
+    protected override string? ReadMoreLink => null;
 }