diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h
index 480bfd28973..4e549deb956 100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h
@@ -40,15 +40,8 @@
 #define	kfpu_allowed()		1
 #define	kfpu_initialize(tsk)	do {} while (0)
 
-#define	kfpu_begin() {					\
-	if (__predict_false(!is_fpu_kern_thread(0)))		\
-		fpu_kern_enter(curthread, NULL, FPU_KERN_NOCTX);\
-}
-
-#define	kfpu_end()	{			\
-	if (__predict_false(curpcb->pcb_flags & PCB_FPUNOSAVE))	\
-		fpu_kern_leave(curthread, NULL);	\
-}
+#define	kfpu_begin()	fpu_kern_enter(curthread, NULL, FPU_KERN_NOCTX)
+#define	kfpu_end()	fpu_kern_leave(curthread, NULL)
 
 /*
  * Check if OS supports AVX and AVX2 by checking XCR0