diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index cb7d53d49cc..9d11e9e6d1e 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -960,9 +960,8 @@ npxgetregs(td, addr)
 			bzero(addr, sizeof(*addr));
 		return (_MC_FPOWNED_NONE);
 	}
-
 	s = intr_disable();
-	if (curthread == PCPU_GET(fpcurthread)) {
+	if (td == PCPU_GET(fpcurthread)) {
 		fpusave(addr);
 #ifdef CPU_ENABLE_SSE
 		if (!cpu_fxsr)
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index cb7d53d49cc..9d11e9e6d1e 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -960,9 +960,8 @@ npxgetregs(td, addr)
 			bzero(addr, sizeof(*addr));
 		return (_MC_FPOWNED_NONE);
 	}
-
 	s = intr_disable();
-	if (curthread == PCPU_GET(fpcurthread)) {
+	if (td == PCPU_GET(fpcurthread)) {
 		fpusave(addr);
 #ifdef CPU_ENABLE_SSE
 		if (!cpu_fxsr)
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index cb7d53d49cc..9d11e9e6d1e 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -960,9 +960,8 @@ npxgetregs(td, addr)
 			bzero(addr, sizeof(*addr));
 		return (_MC_FPOWNED_NONE);
 	}
-
 	s = intr_disable();
-	if (curthread == PCPU_GET(fpcurthread)) {
+	if (td == PCPU_GET(fpcurthread)) {
 		fpusave(addr);
 #ifdef CPU_ENABLE_SSE
 		if (!cpu_fxsr)