diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1bb01ca7..0bc21d11 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -102,14 +102,14 @@ jobs:
         env: { GOOS: freebsd, GOARCH: amd64 }
         run: go build -ldflags "-s -w" -trimpath
       - name: Upload go2rtc_freebsd_amd64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with: { name: go2rtc_freebsd_amd64, path: go2rtc }
 
       - name: Build go2rtc_freebsd_arm64
         env: { GOOS: freebsd, GOARCH: arm64 }
         run: go build -ldflags "-s -w" -trimpath
       - name: Upload go2rtc_freebsd_arm64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with: { name: go2rtc_freebsd_arm64, path: go2rtc }
 
   docker-master:
diff --git a/pkg/webrtc/consumer.go b/pkg/webrtc/consumer.go
index fb90442c..e9d7b2e5 100644
--- a/pkg/webrtc/consumer.go
+++ b/pkg/webrtc/consumer.go
@@ -56,11 +56,11 @@ func (c *Conn) AddTrack(media *core.Media, codec *core.Codec, track *core.Receiv
 		}
 
 	case core.CodecH265:
-		// SafariPay because it is the only browser in the world
-		// that supports WebRTC + H265
-		sender.Handler = h265.SafariPay(1200, sender.Handler)
+		sender.Handler = h265.RTPPay(1200, sender.Handler)
 		if track.Codec.IsRTP() {
 			sender.Handler = h265.RTPDepay(track.Codec, sender.Handler)
+		} else {
+			sender.Handler = h265.RepairAVCC(track.Codec, sender.Handler)
 		}
 
 	case core.CodecPCMA, core.CodecPCMU, core.CodecPCM, core.CodecPCML: