diff --git a/src/HAL/nanoHAL_SystemEvents.c b/src/HAL/nanoHAL_SystemEvents.c
index 954541b725..ac8f6d903f 100644
--- a/src/HAL/nanoHAL_SystemEvents.c
+++ b/src/HAL/nanoHAL_SystemEvents.c
@@ -55,6 +55,6 @@ __nfweak bool SystemState_Query(SYSTEM_STATE_type state)
 #if defined(__CM0_CMSIS_VERSION) || defined(__CM0PLUS_CMSIS_VERSION)
     return (SystemStates[state] > 0) ? true : false;
 #else
-    return __atomic_load_n(&state, __ATOMIC_RELAXED) ? true : false;
+    return (__atomic_load_n(&SystemStates[state], __ATOMIC_RELAXED) > 0) ? true : false;
 #endif
 }