diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
index 93a05fc144..81bb56ba62 100644
--- a/Source/Core/Common/Arm64Emitter.cpp
+++ b/Source/Core/Common/Arm64Emitter.cpp
@@ -4125,11 +4125,24 @@ void ARM64XEmitter::AddImmediate(ARM64Reg Rd, ARM64Reg Rn, u64 imm, bool shift,
 void ARM64XEmitter::ADDI2R_internal(ARM64Reg Rd, ARM64Reg Rn, u64 imm, bool negative, bool flags,
                                     ARM64Reg scratch)
 {
+  DEBUG_ASSERT(Is64Bit(Rd) == Is64Bit(Rn));
+
+  if (!Is64Bit(Rd))
+    imm &= 0xFFFFFFFFULL;
+
   bool has_scratch = scratch != ARM64Reg::INVALID_REG;
   u64 imm_neg = Is64Bit(Rd) ? u64(-s64(imm)) : u64(-s64(imm)) & 0xFFFFFFFFuLL;
   bool neg_neg = negative ? false : true;
 
-  // Fast paths, aarch64 immediate instructions
+  // Special path for zeroes
+  if (imm == 0 && !flags)
+  {
+    if (Rd != Rn)
+      MOV(Rd, Rn);
+    return;
+  }
+
+  // Regular fast paths, aarch64 immediate instructions
   // Try them all first
   if (imm <= 0xFFF)
   {
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
index 725826dd23..1f3426bd47 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
@@ -58,10 +58,8 @@ void JitArm64::psq_lXX(UGeckoInstruction inst)
   {
     if (indexed)
       ADD(addr_reg, gpr.R(inst.RA), gpr.R(inst.RB));
-    else if (offset >= 0)
-      ADD(addr_reg, gpr.R(inst.RA), offset);
     else
-      SUB(addr_reg, gpr.R(inst.RA), std::abs(offset));
+      ADDI2R(addr_reg, gpr.R(inst.RA), offset, addr_reg);
   }
   else
   {
@@ -217,10 +215,8 @@ void JitArm64::psq_stXX(UGeckoInstruction inst)
   {
     if (indexed)
       ADD(addr_reg, gpr.R(inst.RA), gpr.R(inst.RB));
-    else if (offset >= 0)
-      ADD(addr_reg, gpr.R(inst.RA), offset);
     else
-      SUB(addr_reg, gpr.R(inst.RA), std::abs(offset));
+      ADDI2R(addr_reg, gpr.R(inst.RA), offset, addr_reg);
   }
   else
   {