diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index 163772d8d5..21641744d5 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -210,9 +210,12 @@ std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* pa
     config.wall_clock_cntpct = m_uses_wall_clock;
     config.enable_cycle_counting = !m_uses_wall_clock;
 
-    // Code cache size - max in ARM is 128MiB, max in x86_64 is 2GiB
-    // Solaris doesn't support kPageSize >= 512MiB
+    // Code cache size
+#if defined(ARCHITECTURE_arm64) || defined(__sun__)
     config.code_cache_size = std::uint32_t(128_MiB);
+#else
+    config.code_cache_size = std::uint32_t(512_MiB);
+#endif
 
     // Allow memory fault handling to work
     if (m_system.DebuggerEnabled()) {
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index 1d74215971..b00a0d4346 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -269,9 +269,12 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* pa
     config.wall_clock_cntpct = m_uses_wall_clock;
     config.enable_cycle_counting = !m_uses_wall_clock;
 
-    // Code cache size - max in ARM is 128MiB, max in x86_64 is 2GiB
-    // Solaris doesn't support kPageSize >= 512MiB
+    // Code cache size
+#if defined(ARCHITECTURE_arm64) || defined(__sun__)
     config.code_cache_size = std::uint32_t(128_MiB);
+#else
+    config.code_cache_size = std::uint32_t(512_MiB);
+#endif
 
     // Allow memory fault handling to work
     if (m_system.DebuggerEnabled()) {
diff --git a/src/dynarmic/src/dynarmic/backend/x64/a64_interface.cpp b/src/dynarmic/src/dynarmic/backend/x64/a64_interface.cpp
index b895e42251..0fe738e212 100644
--- a/src/dynarmic/src/dynarmic/backend/x64/a64_interface.cpp
+++ b/src/dynarmic/src/dynarmic/backend/x64/a64_interface.cpp
@@ -80,16 +80,15 @@ public:
         };
 
         // TODO: Check code alignment
-        const CodePtr aligned_code_ptr = CodePtr((uintptr_t(GetCurrentBlock()) + 15) & ~uintptr_t(15));
-        const CodePtr current_code_ptr = [this, aligned_code_ptr] {
+
+        const CodePtr current_code_ptr = [this] {
             // RSB optimization
             const u32 new_rsb_ptr = (jit_state.rsb_ptr - 1) & A64JitState::RSBPtrMask;
             if (jit_state.GetUniqueHash() == jit_state.rsb_location_descriptors[new_rsb_ptr]) {
                 jit_state.rsb_ptr = new_rsb_ptr;
                 return CodePtr(jit_state.rsb_codeptrs[new_rsb_ptr]);
             }
-            return aligned_code_ptr;
-            //return GetCurrentBlock();
+            return CodePtr((uintptr_t(GetCurrentBlock()) + 15) & ~uintptr_t(15));
         }();
 
         const HaltReason hr = block_of_code.RunCode(&jit_state, current_code_ptr);