diff --git a/apps/plugins/xrick/3rd_party/miniz/miniz.c b/apps/plugins/xrick/3rd_party/miniz/miniz.c
index 380c9a9502..d422b84252 100644
--- a/apps/plugins/xrick/3rd_party/miniz/miniz.c
+++ b/apps/plugins/xrick/3rd_party/miniz/miniz.c
@@ -202,21 +202,32 @@
 #if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__)
 // MINIZ_X86_OR_X64_CPU is only used to help set the below macros.
 #define MINIZ_X86_OR_X64_CPU 1
+#else
+#define MINIZ_X86_OR_X64_CPU 0
 #endif
 
+
 #if (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU
 // Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian.
 #define MINIZ_LITTLE_ENDIAN 1
 #endif
 
+#ifndef MINIZ_USE_UNALIGNED_LOADS_AND_STORES
 #if MINIZ_X86_OR_X64_CPU
 // Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses.
 #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
+#else
+#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
+#endif
 #endif
 
-#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__)
+#ifndef MINIZ_HAS_64BIT_REGISTERS
+#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__) || defined(__aarch64__)
 // Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions).
 #define MINIZ_HAS_64BIT_REGISTERS 1
+#else
+#define MINIZ_HAS_64BIT_REGISTERS 0
+#endif
 #endif
 
 #if (__GNUC__ >= 7)
@@ -757,6 +768,8 @@ typedef struct
 
 #if MINIZ_HAS_64BIT_REGISTERS
   #define TINFL_USE_64BIT_BITBUF 1
+#else
+  #define TINFL_USE_64BIT_BITBUF 0
 #endif
 
 #if TINFL_USE_64BIT_BITBUF
diff --git a/apps/plugins/xrick/system/miniz_config.h b/apps/plugins/xrick/system/miniz_config.h
index 65899b0c23..fd928ea03a 100644
--- a/apps/plugins/xrick/system/miniz_config.h
+++ b/apps/plugins/xrick/system/miniz_config.h
@@ -25,12 +25,6 @@
 #define MINIZ_NO_MALLOC
 #ifdef ROCKBOX
 #  define MINIZ_NO_ASSERT
-#  ifndef SIMULATOR
-#    define MINIZ_X86_OR_X64_CPU 0
-#    define MINIZ_HAS_64BIT_REGISTERS 0
-#    define TINFL_USE_64BIT_BITBUF 0
-#    define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
-#  endif /* ndef SIMULATOR */
 #endif
 
 #endif /* ndef _MINIZ_CONFIG_H */