diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go
index b63c0d082f..fd62985708 100644
--- a/agent/xds/listeners.go
+++ b/agent/xds/listeners.go
@@ -3,7 +3,6 @@ package xds
 import (
 	"errors"
 	"fmt"
-	"hash/crc32"
 	"net"
 	"net/url"
 	"regexp"
@@ -48,12 +47,6 @@ import (
 
 const virtualIPTag = "virtual"
 
-var crc32q *crc32.Table
-
-func init() {
-	crc32q = crc32.MakeTable(crc32.IEEE)
-}
-
 // listenersFromSnapshot returns the xDS API representation of the "listeners" in the snapshot.
 func (s *ResourceGenerator) listenersFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message, error) {
 	if cfgSnap == nil {
@@ -1098,13 +1091,10 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener(
 	// effect on how they operate, but it does mean that we won't churn
 	// listeners at idle.
 	sort.Slice(l.FilterChains, func(i, j int) bool {
-		outI, _ := proto.Marshal(l.FilterChains[i].FilterChainMatch)
-		crcI := crc32.Checksum(outI, crc32q)
-
-		outJ, _ := proto.Marshal(l.FilterChains[j].FilterChainMatch)
-		crcJ := crc32.Checksum(outJ, crc32q)
-
-		return crcI < crcJ
+		if len(l.FilterChains[i].FilterChainMatch.PrefixRanges) > 0 && len(l.FilterChains[j].FilterChainMatch.PrefixRanges) > 0 {
+			return l.FilterChains[i].FilterChainMatch.PrefixRanges[0].AddressPrefix < l.FilterChains[j].FilterChainMatch.PrefixRanges[0].AddressPrefix
+		}
+		return l.FilterChains[i].FilterChainMatch.ServerNames[0] < l.FilterChains[j].FilterChainMatch.ServerNames[0]
 	})
 
 	// This fallback catch-all filter ensures a listener will be present for health checks to pass