diff --git a/src/Billing/X125010837P.php b/src/Billing/X125010837P.php
index be0ca7bb29e..62cce65e6ba 100644
--- a/src/Billing/X125010837P.php
+++ b/src/Billing/X125010837P.php
@@ -986,8 +986,9 @@ public static function genX12837P(
         }
         // End of Loop 2310B
 
-        // Loop 2310C is omitted in the case of home visits (POS=12).
-        if ($claim->facilityPOS() != 12 && ($claim->facilityNPI() != $claim->billingFacilityNPI())) {
+        // Loop 2310C is omitted in the case of home visits (POS=12)
+        // and when the service facility is the billing facility
+        if ($claim->facilityPOS() != 12 && ($claim->billing_facility['id'] != $claim->facility['id'])) {
             ++$edicount;
             $out .= "NM1" .       // Loop 2310C Service Location
                 "*" . "77" .