diff --git a/src/dynarec/arm64/dynarec_arm64_d8.c b/src/dynarec/arm64/dynarec_arm64_d8.c
index da414c7712..c0a6abe3ae 100644
--- a/src/dynarec/arm64/dynarec_arm64_d8.c
+++ b/src/dynarec/arm64/dynarec_arm64_d8.c
@@ -328,7 +328,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FADDS(v1, v1, s0);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_S(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_S(v1, s0, s5, s6);
                     }
                 } else {
                     FCVT_D_S(s0, s0);
@@ -339,7 +339,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FADDD(v1, v1, s0);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_D(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_D(v1, s0, s5, s6);
                     }
                 }
                 X87_CHECK_PRECISION(v1);
@@ -362,7 +362,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FMULS(v1, v1, s0);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_S(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_S(v1, s0, s5, s6);
                     }
                 } else {
                     FCVT_D_S(s0, s0);
@@ -373,7 +373,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FMULD(v1, v1, s0);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_D(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_D(v1, s0, s5, s6);
                     }
                 }
                 X87_CHECK_PRECISION(v1);
@@ -425,7 +425,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FSUBS(v1, v1, s0);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_S(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_S(v1, s0, s5, s6);
                     }
                 } else {
                     FCVT_D_S(s0, s0);
@@ -436,7 +436,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FSUBD(v1, v1, s0);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_D(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_D(v1, s0, s5, s6);
                     }
                 }
                 X87_CHECK_PRECISION(v1);
@@ -459,7 +459,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FSUBS(v1, s0, v1);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_S(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_S(v1, s0, s5, s6);
                     }
                 } else {
                     FCVT_D_S(s0, s0);
@@ -470,7 +470,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FSUBD(v1, s0, v1);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_D(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_D(v1, s0, s5, s6);
                     }
                 }
                 X87_CHECK_PRECISION(v1);
@@ -493,7 +493,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FDIVS(v1, v1, s0);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_S(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_S(v1, s0, s5, s6);
                     }
                 } else {
                     FCVT_D_S(s0, s0);
@@ -504,7 +504,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FDIVD(v1, v1, s0);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_D(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_D(v1, s0, s5, s6);
                     }
                 }
                 X87_CHECK_PRECISION(v1);
@@ -527,7 +527,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FDIVS(v1, s0, v1);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_S(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_S(v1, s0, s5, s6);
                     }
                 } else {
                     FCVT_D_S(s0, s0);
@@ -538,7 +538,7 @@ uintptr_t dynarec64_D8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     }
                     FDIVD(v1, s0, v1);
                     if(!BOX64ENV(dynarec_fastnan)) {
-                        X87_ARITH_NAN_END_D(v1, v2, s5, s6);
+                        X87_ARITH_NAN_END_D(v1, s0, s5, s6);
                     }
                 }
                 X87_CHECK_PRECISION(v1);