diff --git a/src/crypto/randomx/randomx.cpp b/src/crypto/randomx/randomx.cpp
index c3d299ac1..4f56dc09c 100644
--- a/src/crypto/randomx/randomx.cpp
+++ b/src/crypto/randomx/randomx.cpp
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(_M_X64) || defined(__x86_64__)
 #include "crypto/randomx/jit_compiler_x86_static.hpp"
-#elif defined(XMRIG_ARM) && defined(__aarch64__)
+#elif defined(XMRIG_ARMv8)
 #include "crypto/randomx/jit_compiler_a64_static.hpp"
 #endif
 
@@ -201,7 +201,7 @@ void RandomX_ConfigurationBase::Apply()
 
 #define JIT_HANDLE(x, prev) randomx::JitCompilerX86::engine[k] = &randomx::JitCompilerX86::h_##x
 
-#elif defined(XMRIG_ARM) && defined(__aarch64__)
+#elif defined(XMRIG_ARMv8)
 
 	Log2_ScratchpadL1 = Log2(ScratchpadL1_Size);
 	Log2_ScratchpadL2 = Log2(ScratchpadL2_Size);
diff --git a/src/crypto/randomx/randomx.h b/src/crypto/randomx/randomx.h
index a9b1a0100..6e074dbaf 100644
--- a/src/crypto/randomx/randomx.h
+++ b/src/crypto/randomx/randomx.h
@@ -133,7 +133,7 @@ struct RandomX_ConfigurationBase
 
 	uint32_t ConditionMask_Calculated;
 
-#if defined(XMRIG_ARM) && defined(__aarch64__)
+#if defined(XMRIG_ARMv8)
 	uint32_t Log2_ScratchpadL1;
 	uint32_t Log2_ScratchpadL2;
 	uint32_t Log2_ScratchpadL3;