diff --git a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoresDrawer.java b/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoresDrawer.java
index f1c444db5..5140e5a3a 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoresDrawer.java
+++ b/shared/src/main/java/de/dreier/mytargets/shared/utils/ScoresDrawer.java
@@ -198,7 +198,7 @@ public void onAnimationEnd(Animator animation) {
     }
 
     public void animateToRect(RectF newRect) {
-        if (rect == null) {
+        if (rect == null || shotList == null || shotsPerRow == 0) {
             setRect(newRect);
             return;
         }