diff --git a/Diagnostics/HealthChecker/Analyzer/Invoke-AnalyzerFrequentConfigurationIssues.ps1 b/Diagnostics/HealthChecker/Analyzer/Invoke-AnalyzerFrequentConfigurationIssues.ps1
index 4b99922ca1..5483053069 100644
--- a/Diagnostics/HealthChecker/Analyzer/Invoke-AnalyzerFrequentConfigurationIssues.ps1
+++ b/Diagnostics/HealthChecker/Analyzer/Invoke-AnalyzerFrequentConfigurationIssues.ps1
@@ -525,7 +525,8 @@ function Invoke-AnalyzerFrequentConfigurationIssues {
         $displayWriteType = "Grey"
         $details = $false
 
-        if ($rootPfMailbox.IsExcludedFromServingHierarchy -ne $true) {
+        if ($rootPfMailbox.IsExcludedFromServingHierarchy -ne $true -and
+            $rootPfMailbox.MultiplePublicFolderMailboxes -eq $true) {
             $displayWriteType = "Red"
             $details = "true - Error"
         }
diff --git a/Diagnostics/HealthChecker/DataCollection/OrganizationInformation/Invoke-JobOrganizationInformation.ps1 b/Diagnostics/HealthChecker/DataCollection/OrganizationInformation/Invoke-JobOrganizationInformation.ps1
index aec5b2c419..279cdc3abc 100644
--- a/Diagnostics/HealthChecker/DataCollection/OrganizationInformation/Invoke-JobOrganizationInformation.ps1
+++ b/Diagnostics/HealthChecker/DataCollection/OrganizationInformation/Invoke-JobOrganizationInformation.ps1
@@ -172,12 +172,15 @@ function Invoke-JobOrganizationInformation {
                     [string]$guid = $getOrganizationConfig.RootPublicFolderMailbox
                     Write-Verbose "Trying to collect root public folder mailbox information - $guid"
                     $getMailboxRootPF = Get-Mailbox -PublicFolder $guid -ErrorAction Stop
+                    $multiplePFMailboxes = @(Get-Mailbox -PublicFolder -ErrorAction Stop -ResultSize 2).Count -gt 1
+                    Write-Verbose "There are $(if ($multiplePFMailboxes) { "multiple" } else { "not multiple" }) public folder mailboxes in the environment."
                     $rootPublicFolderMailbox = [PSCustomObject]@{
                         Name                           = $getMailboxRootPF.Name
                         ExchangeGuid                   = $getMailboxRootPF.ExchangeGuid
                         IsExcludedFromServingHierarchy = $getMailboxRootPF.IsExcludedFromServingHierarchy
                         IsHierarchyReady               = $getMailboxRootPF.IsHierarchyReady
                         IsHierarchySyncEnabled         = $getMailboxRootPF.IsHierarchySyncEnabled
+                        MultiplePublicFolderMailboxes  = $multiplePFMailboxes
                     }
                 }
             } catch {