diff --git a/wolfcrypt/src/sha512.c b/wolfcrypt/src/sha512.c
index 95d8cdb30..9e8b1f7d8 100644
--- a/wolfcrypt/src/sha512.c
+++ b/wolfcrypt/src/sha512.c
@@ -1036,9 +1036,9 @@ static int Transform_AVX1(Sha512* sha512)
 
     /* Wipe variables */
     #if !defined(HAVE_INTEL_AVX1)&&!defined(HAVE_INTEL_AVX2)
-    ForceZero(W_X, sizeof(word64) * 16);
+    XMEMSET(W_X, 0, sizeof(word64) * 16);
     #endif
-    ForceZero(T, sizeof(T));
+    XMEMSET(T, 0, sizeof(T));
 
     return 0;
 }
@@ -1107,9 +1107,9 @@ static int Transform_AVX1_RORX(Sha512* sha512)
 
     /* Wipe variables */
     #if !defined(HAVE_INTEL_AVX1)&&!defined(HAVE_INTEL_AVX2)
-    ForceZero(W_X, sizeof(word64) * 16);
+    XMEMSET(W_X, 0, sizeof(word64) * 16);
     #endif
-    ForceZero(T, sizeof(T));
+    XMEMSET(T, 0, sizeof(T));
 
     return 0;
 }
@@ -1287,9 +1287,9 @@ static int Transform_AVX2(Sha512* sha512)
 
     /* Wipe variables */
     #if !defined(HAVE_INTEL_AVX1)&&!defined(HAVE_INTEL_AVX2)
-    ForceZero(W, sizeof(word64) * 16);
+    XMEMSET(W, 0, sizeof(word64) * 16);
     #endif
-    ForceZero(T, sizeof(T));
+    XMEMSET(T, 0, sizeof(T));
 
     return 0;
 }