diff --git a/src/codec/SkWebpCodec.cpp b/src/codec/SkWebpCodec.cpp
index a90d452..9e2dead 100644
--- a/src/codec/SkWebpCodec.cpp
+++ b/src/codec/SkWebpCodec.cpp
@@ -220,12 +220,15 @@
         return 0;
     }
 
-    const int repCount = WebPDemuxGetI(fDemux.get(), WEBP_FF_LOOP_COUNT);
-    if (0 == repCount) {
+    int loopCount = WebPDemuxGetI(fDemux.get(), WEBP_FF_LOOP_COUNT);
+    if (0 == loopCount) {
         return kRepetitionCountInfinite;
     }
 
-    return repCount;
+#ifndef SK_LEGACY_WEBP_LOOP_COUNT
+    loopCount--;
+#endif
+    return loopCount;
 }
 
 int SkWebpCodec::onGetFrameCount() {
diff --git a/tests/CodecAnimTest.cpp b/tests/CodecAnimTest.cpp
index 6e895f7..44446bc 100644
--- a/tests/CodecAnimTest.cpp
+++ b/tests/CodecAnimTest.cpp
@@ -155,13 +155,22 @@
         { "images/blendBG.webp", 7,
             { 0, kNoFrame, kNoFrame, kNoFrame, 4, 4 },
             { kOpaque, kOpaque, kUnpremul, kOpaque, kUnpremul, kUnpremul },
-            { 525, 500, 525, 437, 609, 729, 444 }, 7,
+            { 525, 500, 525, 437, 609, 729, 444 },
+#ifdef SK_LEGACY_WEBP_LOOP_COUNT
+            7,
+#else
+            6,
+#endif
             { kKeep, kKeep, kKeep, kKeep, kKeep, kKeep, kKeep } },
         { "images/required.webp", 7,
             { 0, 1, 1, kNoFrame, 4, 4 },
             { kOpaque, kUnpremul, kUnpremul, kOpaque, kOpaque, kOpaque },
             { 100, 100, 100, 100, 100, 100, 100 },
+#ifdef SK_LEGACY_WEBP_LOOP_COUNT
             1,
+#else
+            0,
+#endif
             { kKeep, kRestoreBG, kKeep, kKeep, kKeep, kRestoreBG, kKeep } },
     };