diff --git a/lib/singlepass-backend/src/codegen_x64.rs b/lib/singlepass-backend/src/codegen_x64.rs
index 93c4e0fdd..1bfa5602e 100644
--- a/lib/singlepass-backend/src/codegen_x64.rs
+++ b/lib/singlepass-backend/src/codegen_x64.rs
@@ -1512,24 +1512,23 @@ impl X64FunctionCode {
             a.emit_add(Size::S64, Location::GPR(tmp_base), Location::GPR(tmp_bound));
             a.emit_mov(Size::S32, addr, Location::GPR(tmp_addr));
 
-            if offset != 0 && value_size != 0 {
-                // This branch is used for emitting "faster" code for the special case of (offset + value_size) not exceeding u32 range.
-                match (offset as u32).checked_add(value_size as u32) {
-                    Some(x) => {
-                        a.emit_add(Size::S64, Location::Imm32(x), Location::GPR(tmp_addr));
-                    }
-                    None => {
-                        a.emit_add(
-                            Size::S64,
-                            Location::Imm32(offset as u32),
-                            Location::GPR(tmp_addr),
-                        );
-                        a.emit_add(
-                            Size::S64,
-                            Location::Imm32(value_size as u32),
-                            Location::GPR(tmp_addr),
-                        );
-                    }
+            // This branch is used for emitting "faster" code for the special case of (offset + value_size) not exceeding u32 range.
+            match (offset as u32).checked_add(value_size as u32) {
+                Some(0) => {}
+                Some(x) => {
+                    a.emit_add(Size::S64, Location::Imm32(x), Location::GPR(tmp_addr));
+                }
+                None => {
+                    a.emit_add(
+                        Size::S64,
+                        Location::Imm32(offset as u32),
+                        Location::GPR(tmp_addr),
+                    );
+                    a.emit_add(
+                        Size::S64,
+                        Location::Imm32(value_size as u32),
+                        Location::GPR(tmp_addr),
+                    );
                 }
             }