diff --git a/crates/bevy_mikktspace/src/generated.rs b/crates/bevy_mikktspace/src/generated.rs
index 592e1679e5..2589e3930b 100644
--- a/crates/bevy_mikktspace/src/generated.rs
+++ b/crates/bevy_mikktspace/src/generated.rs
@@ -253,6 +253,10 @@ pub unsafe fn genTangSpace<I: Geometry>(geometry: &mut I, fAngularThreshold: f32
         t += 1
     }
     iNrTrianglesIn = iTotTris - iDegenTriangles;
+
+    if iNrTrianglesIn <= 0 {
+        return false;
+    }
     DegenPrologue(
         pTriInfos.as_mut_ptr(),
         piTriListIn.as_mut_ptr(),
@@ -1030,7 +1034,7 @@ unsafe fn InitTriInfo<I: Geometry>(
         }
         f += 1
     }
-    while t < iNrTrianglesIn - 1 {
+    while t + 1 < iNrTrianglesIn {
         let iFO_a: i32 = (*pTriInfos.offset(t as isize)).iOrgFaceNumber;
         let iFO_b: i32 = (*pTriInfos.offset((t + 1) as isize)).iOrgFaceNumber;
         if iFO_a == iFO_b {