diff --git a/simde/simde-common.h b/simde/simde-common.h
index f2fbc82b9..715e0c5c1 100644
--- a/simde/simde-common.h
+++ b/simde/simde-common.h
@@ -687,7 +687,7 @@ typedef SIMDE_FLOAT64_TYPE simde_float64;
 #    if defined(SIMDE_ARCH_X86) && !defined(SIMDE_ARCH_AMD64)
 #      define SIMDE_BUG_GCC_94482
 #    endif
-#    if defined(SIMDE_ARCH_AARCH64)
+#    if !HEDLEY_GCC_VERSION_CHECK(9,4,0) && defined(SIMDE_ARCH_AARCH64)
 #      define SIMDE_BUG_GCC_94488
 #    endif
 #    if defined(SIMDE_ARCH_POWER)
diff --git a/simde/x86/sse2.h b/simde/x86/sse2.h
index 0d50dd3ae..56523b90b 100644
--- a/simde/x86/sse2.h
+++ b/simde/x86/sse2.h
@@ -4920,7 +4920,7 @@ simde_mm_srli_epi64 (simde__m128i a, const int imm8)
 
 #if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
   r_.neon_u64 = vshrq_n_u64(a_.neon_u64, imm8);
-#elif defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR)
+#elif defined(SIMDE_VECTOR_SUBSCRIPT_SCALAR) && !defined(SIMDE_BUG_GCC_94488)
   r_.u64 = a_.u64 >> imm8;
 #else
   SIMDE_VECTORIZE