diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
index f2d7599..24453e2 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
@@ -392,7 +392,7 @@
 
   private boolean boundsMatchesCompositionAspectRatio() {
     LottieComposition composition = this.composition;
-    if (composition == null) {
+    if (composition == null || getBounds().isEmpty()) {
       return true;
     }
     return aspectRatio(getBounds()) == aspectRatio(composition.getBounds());
diff --git a/sample/src/androidTest/java/com/airbnb/lottie/samples/HappoSnapshotter.kt b/sample/src/androidTest/java/com/airbnb/lottie/samples/HappoSnapshotter.kt
index 4d3d279..976668d 100644
--- a/sample/src/androidTest/java/com/airbnb/lottie/samples/HappoSnapshotter.kt
+++ b/sample/src/androidTest/java/com/airbnb/lottie/samples/HappoSnapshotter.kt
@@ -51,6 +51,8 @@
     private val gitBranch = URLEncoder.encode((if (BC.BITRISE_GIT_BRANCH == "null") BC.GIT_BRANCH else BC.BITRISE_GIT_BRANCH).replace("/", "_"), "UTF-8")
     private val androidVersion = "android${Build.VERSION.SDK_INT}"
     private val reportNamePrefixes = listOf(BC.GIT_SHA, gitBranch, BC.VERSION_NAME).filter { it.isNotBlank() }
+    // Use this when running snapshots locally.
+    // private val reportNamePrefixes = listOf(System.currentTimeMillis().toString()).filter { it.isNotBlank() }
     private val reportNames = reportNamePrefixes.map { "$it-$androidVersion" }
 
     private val okhttp = OkHttpClient()