diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index be8c037..937f1b7 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -21,6 +21,7 @@
 import android.util.AttributeSet;
 import android.util.JsonReader;
 import android.util.Log;
+import android.view.View;
 
 import com.airbnb.lottie.model.KeyPath;
 import com.airbnb.lottie.value.LottieFrameInfo;
@@ -71,6 +72,7 @@
   private final LottieDrawable lottieDrawable = new LottieDrawable();
   private String animationName;
   private @RawRes int animationResId;
+  private boolean wasAnimatingWhenVisibilityChanged = false;
   private boolean wasAnimatingWhenDetached = false;
   private boolean autoPlay = false;
   private RenderMode renderMode = RenderMode.Automatic;
@@ -228,6 +230,20 @@
     setRepeatCount(ss.repeatCount);
   }
 
+  @Override
+  protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
+    if (visibility == VISIBLE && wasAnimatingWhenVisibilityChanged) {
+      resumeAnimation();
+    } else {
+      if (isAnimating()) {
+        wasAnimatingWhenVisibilityChanged = true;
+        pauseAnimation();
+      } else {
+        wasAnimatingWhenVisibilityChanged = false;
+      }
+    }
+  }
+
   @Override protected void onAttachedToWindow() {
     super.onAttachedToWindow();
     if (autoPlay && wasAnimatingWhenDetached) {