diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index 73f3639b20402..a0c50fae558d2 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -868,6 +868,7 @@ size_t TextLayoutShaper::shapeFontRun(const SkPaint* paint) {
     hb_shape(font, mBuffer, NULL, 0);
     hb_font_destroy(font);
 
+    mShapingPaint.setTypeface(paint->getTypeface());
     return baseGlyphCount;
 }