diff --git a/Diagnostics/HealthChecker/Analyzer/Security/Invoke-AnalyzerSecurityCve-2021-34470.ps1 b/Diagnostics/HealthChecker/Analyzer/Security/Invoke-AnalyzerSecurityCve-2021-34470.ps1
index 06fa09c760..bc8c482433 100644
--- a/Diagnostics/HealthChecker/Analyzer/Security/Invoke-AnalyzerSecurityCve-2021-34470.ps1
+++ b/Diagnostics/HealthChecker/Analyzer/Security/Invoke-AnalyzerSecurityCve-2021-34470.ps1
@@ -28,7 +28,8 @@ function Invoke-AnalyzerSecurityCve-2021-34470 {
         (($SecurityObject.MajorVersion -eq [HealthChecker.ExchangeMajorVersion]::Exchange2016) -and
             ($SecurityObject.CU -lt [HealthChecker.ExchangeCULevel]::CU21)) -or
         (($SecurityObject.MajorVersion -eq [HealthChecker.ExchangeMajorVersion]::Exchange2019) -and
-            ($SecurityObject.CU -lt [HealthChecker.ExchangeCULevel]::CU10))) {
+            ($SecurityObject.CU -lt [HealthChecker.ExchangeCULevel]::CU10)) -and
+        $SecurityObject.ServerRole -ne [HealthChecker.ExchangeServerRole]::Edge) {
         Write-Verbose "Testing CVE: CVE-2021-34470"
 
         $displayWriteTypeColor = $null