diff --git a/pkg/format/h264.go b/pkg/format/h264.go
index edf0b06f..3868bbd5 100644
--- a/pkg/format/h264.go
+++ b/pkg/format/h264.go
@@ -181,8 +181,8 @@ func (t *H264) Marshal() (string, string) {
 func (t *H264) Clone() Format {
 	return &H264{
 		PayloadTyp:        t.PayloadTyp,
-		SPS:               t.SPS,
-		PPS:               t.PPS,
+		SPS:               t.SafeSPS(),
+		PPS:               t.SafePPS(),
 		PacketizationMode: t.PacketizationMode,
 	}
 }
diff --git a/pkg/format/h265.go b/pkg/format/h265.go
index 72e3003a..3bf8393f 100644
--- a/pkg/format/h265.go
+++ b/pkg/format/h265.go
@@ -121,9 +121,9 @@ func (t *H265) Marshal() (string, string) {
 func (t *H265) Clone() Format {
 	return &H265{
 		PayloadTyp: t.PayloadTyp,
-		VPS:        t.VPS,
-		SPS:        t.SPS,
-		PPS:        t.PPS,
+		VPS:        t.SafeVPS(),
+		SPS:        t.SafeSPS(),
+		PPS:        t.SafePPS(),
 		MaxDONDiff: t.MaxDONDiff,
 	}
 }