diff --git a/sway-lib-core/src/ops.sw b/sway-lib-core/src/ops.sw
index cc01cf146fc..4f614b13d17 100644
--- a/sway-lib-core/src/ops.sw
+++ b/sway-lib-core/src/ops.sw
@@ -3,6 +3,9 @@ library;
 use ::primitives::*;
 use ::slice::*;
 
+const MAX_U32_U64: u64 = __transmute::<u32, u64>(u32::max());
+const MAX_U16_U64: u64 = __transmute::<u16, u64>(u16::max());
+
 /// Trait for the addition of two values.
 pub trait Add {
     /// Add two values of the same type.
@@ -56,69 +59,62 @@ impl Add for u64 {
 // Emulate overflowing arithmetic for non-64-bit integer types
 impl Add for u32 {
     fn add(self, other: Self) -> Self {
-        // any non-64-bit value is compiled to a u64 value under-the-hood
-        // constants (like Self::max() below) are also automatically promoted to u64
-        let res = __add(self, other);
-        // integer overflow
-        if __gt(res, Self::max()) {
+        let res_u64 = __add(
+            __transmute::<Self, u64>(self),
+            __transmute::<Self, u64>(other),
+        );
+
+        if __gt(res_u64, MAX_U32_U64) {
             if panic_on_overflow_is_enabled() {
                 __revert(0)
             } else {
                 // overflow enabled
                 // res % (Self::max() + 1)
-                __mod(res, __add(Self::max(), 1))
+                __transmute::<u64, Self>(__mod(res_u64, __add(MAX_U32_U64, 1)))
             }
         } else {
-            // no overflow
-            res
+            __transmute::<u64, Self>(res_u64)
         }
     }
 }
 
 impl Add for u16 {
     fn add(self, other: Self) -> Self {
-        let res = __add(self, other);
-        if __gt(res, Self::max()) {
+        let res_u64 = __add(
+            __transmute::<Self, u64>(self),
+            __transmute::<Self, u64>(other),
+        );
+
+        if __gt(res_u64, MAX_U16_U64) {
             if panic_on_overflow_is_enabled() {
                 __revert(0)
             } else {
                 // overflow enabled
                 // res % (Self::max() + 1)
-                __mod(res, __add(Self::max(), 1))
+                __transmute::<u64, Self>(__mod(res_u64, __add(MAX_U16_U64, 1)))
             }
         } else {
-            res
+            __transmute::<u64, Self>(res_u64)
         }
     }
 }
 
 impl Add for u8 {
     fn add(self, other: Self) -> Self {
-        let self_u64 = asm(input: self) {
-            input: u64
-        };
-        let other_u64 = asm(input: other) {
-            input: u64
-        };
-        let res_u64 = __add(self_u64, other_u64);
-        let max_u8_u64 = asm(input: Self::max()) {
-            input: u64
-        };
+        let res_u64 = __add(u8_as_u64(self), u8_as_u64(other));
+
+        let max_u8_u64 = u8_as_u64(Self::max());
+
         if __gt(res_u64, max_u8_u64) {
             if panic_on_overflow_is_enabled() {
                 __revert(0)
             } else {
                 // overflow enabled
                 // res % (Self::max() + 1)
-                let res_u64 = __mod(res_u64, __add(max_u8_u64, 1));
-                asm(input: res_u64) {
-                    input: u8
-                }
+                u64_as_u8(__mod(res_u64, __add(max_u8_u64, 1)))
             }
         } else {
-            asm(input: res_u64) {
-                input: u8
-            }
+            u64_as_u8(res_u64)
         }
     }
 }
@@ -173,23 +169,65 @@ impl Subtract for u64 {
     }
 }
 
-// unlike addition, underflowing subtraction does not need special treatment
-// because VM handles underflow
 impl Subtract for u32 {
     fn subtract(self, other: Self) -> Self {
-        __sub(self, other)
+        let res_u64 = __sub(
+            __transmute::<Self, u64>(self),
+            __transmute::<Self, u64>(other),
+        );
+
+        if __gt(res_u64, MAX_U32_U64) {
+            if panic_on_overflow_is_enabled() {
+                __revert(0)
+            } else {
+                // overflow enabled
+                // res % (Self::max() + 1)
+                __transmute::<u64, Self>(__mod(res_u64, __add(MAX_U32_U64, 1)))
+            }
+        } else {
+            __transmute::<u64, Self>(res_u64)
+        }
     }
 }
 
 impl Subtract for u16 {
     fn subtract(self, other: Self) -> Self {
-        __sub(self, other)
+        let res_u64 = __sub(
+            __transmute::<Self, u64>(self),
+            __transmute::<Self, u64>(other),
+        );
+
+        if __gt(res_u64, MAX_U16_U64) {
+            if panic_on_overflow_is_enabled() {
+                __revert(0)
+            } else {
+                // overflow enabled
+                // res % (Self::max() + 1)
+                __transmute::<u64, Self>(__mod(res_u64, __add(MAX_U16_U64, 1)))
+            }
+        } else {
+            __transmute::<u64, Self>(res_u64)
+        }
     }
 }
 
 impl Subtract for u8 {
     fn subtract(self, other: Self) -> Self {
-        __sub(self, other)
+        let res_u64 = __sub(u8_as_u64(self), u8_as_u64(other));
+
+        let max_u8_u64 = u8_as_u64(Self::max());
+
+        if __gt(res_u64, max_u8_u64) {
+            if panic_on_overflow_is_enabled() {
+                __revert(0)
+            } else {
+                // overflow enabled
+                // res % (Self::max() + 1)
+                u64_as_u8(__mod(res_u64, __add(max_u8_u64, 1)))
+            }
+        } else {
+            u64_as_u8(res_u64)
+        }
     }
 }
 
@@ -246,67 +284,62 @@ impl Multiply for u64 {
 // Emulate overflowing arithmetic for non-64-bit integer types
 impl Multiply for u32 {
     fn multiply(self, other: Self) -> Self {
-        // any non-64-bit value is compiled to a u64 value under-the-hood
-        // constants (like Self::max() below) are also automatically promoted to u64
-        let res = __mul(self, other);
-        if __gt(res, Self::max()) {
+        let res_u64 = __mul(
+            __transmute::<Self, u64>(self),
+            __transmute::<Self, u64>(other),
+        );
+
+        if __gt(res_u64, MAX_U32_U64) {
             if panic_on_overflow_is_enabled() {
-                // integer overflow
                 __revert(0)
             } else {
                 // overflow enabled
                 // res % (Self::max() + 1)
-                __mod(res, __add(Self::max(), 1))
+                __transmute::<u64, Self>(__mod(res_u64, __add(MAX_U32_U64, 1)))
             }
         } else {
-            // no overflow
-            res
+            __transmute::<u64, Self>(res_u64)
         }
     }
 }
 
 impl Multiply for u16 {
     fn multiply(self, other: Self) -> Self {
-        let res = __mul(self, other);
-        if __gt(res, Self::max()) {
+        let res_u64 = __mul(
+            __transmute::<Self, u64>(self),
+            __transmute::<Self, u64>(other),
+        );
+
+        if __gt(res_u64, MAX_U16_U64) {
             if panic_on_overflow_is_enabled() {
                 __revert(0)
             } else {
-                __mod(res, __add(Self::max(), 1))
+                // overflow enabled
+                // res % (Self::max() + 1)
+                __transmute::<u64, Self>(__mod(res_u64, __add(MAX_U16_U64, 1)))
             }
         } else {
-            res
+            __transmute::<u64, Self>(res_u64)
         }
     }
 }
 
 impl Multiply for u8 {
     fn multiply(self, other: Self) -> Self {
-        let self_u64 = asm(input: self) {
-            input: u64
-        };
-        let other_u64 = asm(input: other) {
-            input: u64
-        };
-        let res_u64 = __mul(self_u64, other_u64);
-        let max_u8_u64 = asm(input: Self::max()) {
-            input: u64
-        };
+        let res_u64 = __mul(u8_as_u64(self), u8_as_u64(other));
+
+        let max_u8_u64 = u8_as_u64(Self::max());
+
         if __gt(res_u64, max_u8_u64) {
             if panic_on_overflow_is_enabled() {
                 __revert(0)
             } else {
                 // overflow enabled
                 // res % (Self::max() + 1)
-                let res_u64 = __mod(res_u64, __add(max_u8_u64, 1));
-                asm(input: res_u64) {
-                    input: u8
-                }
+                u64_as_u8(__mod(res_u64, __add(max_u8_u64, 1)))
             }
         } else {
-            asm(input: res_u64) {
-                input: u8
-            }
+            u64_as_u8(res_u64)
         }
     }
 }
@@ -1741,3 +1774,15 @@ fn panic_on_overflow_is_enabled() -> bool {
         0,
     )
 }
+
+fn u8_as_u64(val: u8) -> u64 {
+    asm(input: val) {
+        input: u64
+    }
+}
+
+fn u64_as_u8(val: u64) -> u8 {
+    asm(input: val) {
+        input: u8
+    }
+}
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap
index eff418fc29d..ecec6d9bbeb 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap
@@ -6,6 +6,10 @@ exit status: 0
 output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode
    Compiling library core (sway-lib-core)
+// IR: Final
+library {
+}
+
    Compiling library std (sway-lib-std)
 // IR: Final
 library {
diff --git a/test/src/in_language_tests/test_programs/math_inline_tests/src/main.sw b/test/src/in_language_tests/test_programs/math_inline_tests/src/main.sw
index 7a320860c83..0e4bdbb45a9 100644
--- a/test/src/in_language_tests/test_programs/math_inline_tests/src/main.sw
+++ b/test/src/in_language_tests/test_programs/math_inline_tests/src/main.sw
@@ -902,6 +902,22 @@ fn math_u256_overflow_mul_revert() {
     log(b);
 }
 
+#[test(should_revert)]
+fn math_u16_underflow_sub_revert() {
+    let a = 0u16;
+    let b = 1u16;
+    let c = a - b;
+    log(c);
+}
+
+#[test(should_revert)]
+fn math_u32_underflow_sub_revert() {
+    let a = 0u32;
+    let b = 1u32;
+    let c = a - b;
+    log(c);
+}
+
 #[test]
 fn math_u8_overflow_add() {
     let _ = disable_panic_on_overflow();
@@ -924,6 +940,26 @@ fn math_u8_overflow_add() {
     require(e == u8::max() - 2, e);
 }
 
+#[test]
+fn math_u8_underflow_sub() {
+    assert((u8::max() - u8::max()) == 0u8);
+    assert((u8::min() - u8::min()) == 0u8);
+    assert((10u8 - 5u8) == 5u8);
+
+    let _ = disable_panic_on_overflow();
+
+    let a = 0u8;
+    let b = 1u8;
+
+    let c = a - b;
+    assert(c == u8::max());
+
+    let d = u8::max();
+
+    let e = a - d;
+    assert(e == b);
+}
+
 #[test]
 fn math_u16_overflow_add() {
     let _ = disable_panic_on_overflow();
@@ -946,6 +982,26 @@ fn math_u16_overflow_add() {
     require(e == u16::max() - 2, e);
 }
 
+#[test]
+fn math_u16_underflow_sub() {
+    assert((u16::max() - u16::max()) == 0u16);
+    assert((u16::min() - u16::min()) == 0u16);
+    assert((10u16 - 5u16) == 5u16);
+
+    let _ = disable_panic_on_overflow();
+
+    let a = 0u16;
+    let b = 1u16;
+
+    let c = a - b;
+    assert(c == u16::max());
+
+    let d = u16::max();
+
+    let e = a - d;
+    assert(e == b);
+}
+
 #[test]
 fn math_u32_overflow_add() {
     let _ = disable_panic_on_overflow();
@@ -968,6 +1024,26 @@ fn math_u32_overflow_add() {
     require(e == u32::max() - 2, e);
 }
 
+#[test]
+fn math_u32_underflow_sub() {
+    assert((u32::max() - u32::max()) == 0u32);
+    assert((u32::min() - u32::min()) == 0u32);
+    assert((10u32 - 5u32) == 5u32);
+
+    let _ = disable_panic_on_overflow();
+
+    let a = 0u32;
+    let b = 1u32;
+
+    let c = a - b;
+    assert(c == u32::max());
+
+    let d = u32::max();
+
+    let e = a - d;
+    assert(e == b);
+}
+
 #[test]
 fn math_u64_overflow_add() {
     let _ = disable_panic_on_overflow();