--- sys/arm64/arm64/vfp.c.orig
+++ sys/arm64/arm64/vfp.c
@@ -934,6 +934,9 @@
 
 	pcb = td->td_pcb;
 
+	if (td == curthread && (pcb->pcb_fpflags & PCB_FP_STARTED) != 0)
+		vfp_save_state(td, pcb);
+
 	/* If there is no SVE support in HW then we don't support NT_ARM_SVE */
 	if (pcb->pcb_sve_len == 0)
 		return (false);
@@ -955,9 +958,6 @@
 		KASSERT(*sizep == sizeof(struct svereg_header) + buf_size,
 		    ("%s: invalid size", __func__));
 
-		if (td == curthread && (pcb->pcb_fpflags & PCB_FP_STARTED) != 0)
-			vfp_save_state(td, pcb);
-
 		header = buf;
 		memset(header, 0, sizeof(*header));