diff --git a/src/loaders/lottie/tvgLottieModel.cpp b/src/loaders/lottie/tvgLottieModel.cpp
index 045c7376..9a05dc1d 100644
--- a/src/loaders/lottie/tvgLottieModel.cpp
+++ b/src/loaders/lottie/tvgLottieModel.cpp
@@ -697,7 +697,10 @@ float LottieLayer::remap(LottieComposition* comp, float frameNo, LottieExpressio
     } else {
         frameNo -= startFrame;
     }
-    return (frameNo / timeStretch);
+    frameNo /= timeStretch;
+
+    if (frameNo >= comp->frameCnt()) return cache.frameNo;
+    return frameNo;
 }