diff --git a/hysteria/packet.go b/hysteria/packet.go
index a597c76..18d92c6 100644
--- a/hysteria/packet.go
+++ b/hysteria/packet.go
@@ -184,15 +184,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
 	if buffer.Len() > 0xffff {
 		return quic.ErrMessageTooLarge(0xffff)
 	}
-	packetId := c.packetId.Add(1)
-	if packetId > math.MaxUint16 {
-		c.packetId.Store(0)
-		packetId = 0
-	}
+	packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
 	message := allocMessage()
 	*message = udpMessage{
 		sessionID:     c.sessionID,
-		packetID:      uint16(packetId),
+		packetID:      packetId,
 		fragmentTotal: 1,
 		host:          destination.AddrString(),
 		port:          destination.Port,
@@ -224,16 +220,12 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
 	if len(p) > 0xffff {
 		return 0, quic.ErrMessageTooLarge(0xffff)
 	}
-	packetId := c.packetId.Add(1)
-	if packetId > math.MaxUint16 {
-		c.packetId.Store(0)
-		packetId = 0
-	}
+	packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
 	message := allocMessage()
 	destination := M.SocksaddrFromNet(addr)
 	*message = udpMessage{
 		sessionID:     c.sessionID,
-		packetID:      uint16(packetId),
+		packetID:      packetId,
 		fragmentTotal: 1,
 		host:          destination.AddrString(),
 		port:          destination.Port,
diff --git a/hysteria2/packet.go b/hysteria2/packet.go
index e3c1f1c..b1cac0e 100644
--- a/hysteria2/packet.go
+++ b/hysteria2/packet.go
@@ -180,15 +180,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
 	if buffer.Len() > 0xffff {
 		return quic.ErrMessageTooLarge(0xffff)
 	}
-	packetId := c.packetId.Add(1)
-	if packetId > math.MaxUint16 {
-		c.packetId.Store(0)
-		packetId = 0
-	}
+	packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
 	message := allocMessage()
 	*message = udpMessage{
 		sessionID:     c.sessionID,
-		packetID:      uint16(packetId),
+		packetID:      packetId,
 		fragmentTotal: 1,
 		destination:   destination.String(),
 		data:          buffer,
@@ -219,15 +215,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
 	if len(p) > 0xffff {
 		return 0, quic.ErrMessageTooLarge(0xffff)
 	}
-	packetId := c.packetId.Add(1)
-	if packetId > math.MaxUint16 {
-		c.packetId.Store(0)
-		packetId = 0
-	}
+	packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
 	message := allocMessage()
 	*message = udpMessage{
 		sessionID:     c.sessionID,
-		packetID:      uint16(packetId),
+		packetID:      packetId,
 		fragmentTotal: 1,
 		destination:   addr.String(),
 		data:          buf.As(p),
diff --git a/tuic/packet.go b/tuic/packet.go
index 888695f..c9aa54e 100644
--- a/tuic/packet.go
+++ b/tuic/packet.go
@@ -204,15 +204,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
 	if !destination.IsValid() {
 		return E.New("invalid destination address")
 	}
-	packetId := c.packetId.Add(1)
-	if packetId > math.MaxUint16 {
-		c.packetId.Store(0)
-		packetId = 0
-	}
+	packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
 	message := allocMessage()
 	*message = udpMessage{
 		sessionID:     c.sessionID,
-		packetID:      uint16(packetId),
+		packetID:      packetId,
 		fragmentTotal: 1,
 		destination:   destination,
 		data:          buffer,
@@ -249,15 +245,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
 	if !destination.IsValid() {
 		return 0, E.New("invalid destination address")
 	}
-	packetId := c.packetId.Add(1)
-	if packetId > math.MaxUint16 {
-		c.packetId.Store(0)
-		packetId = 0
-	}
+	packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
 	message := allocMessage()
 	*message = udpMessage{
 		sessionID:     c.sessionID,
-		packetID:      uint16(packetId),
+		packetID:      packetId,
 		fragmentTotal: 1,
 		destination:   destination,
 		data:          buf.As(p),