diff --git a/src/hb/aat/layout_kerx_table.rs b/src/hb/aat/layout_kerx_table.rs
index 40ad93df..eedf426f 100644
--- a/src/hb/aat/layout_kerx_table.rs
+++ b/src/hb/aat/layout_kerx_table.rs
@@ -34,6 +34,7 @@ pub(crate) fn apply(c: &mut AatApplyContext) -> Option<()> {
 
     let mut subtable_idx = 0;
 
+    let mut buffer_is_reversed = false;
     let mut seen_cross_stream = false;
     for subtable in kerx.subtables().iter() {
         let Ok(subtable) = subtable else {
@@ -84,8 +85,9 @@ pub(crate) fn apply(c: &mut AatApplyContext) -> Option<()> {
             continue;
         };
 
-        if reverse {
+        if reverse != buffer_is_reversed {
             c.buffer.reverse();
+            buffer_is_reversed = reverse;
         }
 
         match &kind {
@@ -136,10 +138,9 @@ pub(crate) fn apply(c: &mut AatApplyContext) -> Option<()> {
                 apply_simple_kerning(c, &subtable, format6);
             }
         }
-
-        if reverse {
-            c.buffer.reverse();
-        }
+    }
+    if buffer_is_reversed {
+        c.buffer.reverse();
     }
 
     Some(())
diff --git a/src/hb/aat/layout_morx_table.rs b/src/hb/aat/layout_morx_table.rs
index 05490429..34d73ac5 100644
--- a/src/hb/aat/layout_morx_table.rs
+++ b/src/hb/aat/layout_morx_table.rs
@@ -87,6 +87,7 @@ pub fn apply<'a>(c: &mut AatApplyContext<'a>, map: &'a AatMap) -> Option<()> {
 
     let mut subtable_idx = 0;
 
+    let mut buffer_is_reversed = false;
     for (chain, chain_flags) in chains.iter().zip(map.chain_flags.iter()) {
         let Ok(chain) = chain else {
             continue;
@@ -156,17 +157,17 @@ pub fn apply<'a>(c: &mut AatApplyContext<'a>, map: &'a AatMap) -> Option<()> {
                 subtable.is_backwards() != c.buffer.direction.is_backward()
             };
 
-            if reverse {
+            if reverse != buffer_is_reversed {
                 c.buffer.reverse();
+                buffer_is_reversed = reverse;
             }
 
             if let Ok(kind) = subtable.kind() {
                 apply_subtable(kind, c);
             }
-
-            if reverse {
-                c.buffer.reverse();
-            }
+        }
+        if buffer_is_reversed {
+            c.buffer.reverse();
         }
     }
 
diff --git a/src/hb/kerning.rs b/src/hb/kerning.rs
index 49ec5b9f..eb607a34 100644
--- a/src/hb/kerning.rs
+++ b/src/hb/kerning.rs
@@ -41,6 +41,7 @@ pub fn hb_ot_layout_kern(
 
     let mut subtable_idx = 0;
 
+    let mut buffer_is_reversed = false;
     let mut seen_cross_stream = false;
     for subtable in kern.subtables() {
         let Ok(subtable) = subtable else { continue };
@@ -89,8 +90,9 @@ pub fn hb_ot_layout_kern(
             continue;
         };
 
-        if reverse {
+        if reverse != buffer_is_reversed {
             c.buffer.reverse();
+            buffer_is_reversed = reverse;
         }
 
         match kind {
@@ -108,10 +110,9 @@ pub fn hb_ot_layout_kern(
             }
             _ => {}
         }
-
-        if reverse {
-            c.buffer.reverse();
-        }
+    }
+    if buffer_is_reversed {
+        c.buffer.reverse();
     }
     Some(())
 }