diff --git a/src/Avalonia.Animation/Animator`1.cs b/src/Avalonia.Animation/Animator`1.cs
index ab82bfb35d..e4af0f356d 100644
--- a/src/Avalonia.Animation/Animator`1.cs
+++ b/src/Avalonia.Animation/Animator`1.cs
@@ -37,16 +37,11 @@ namespace Avalonia.Animation
             if (!_isVerifiedAndConverted)
                 VerifyConvertKeyFrames();
 
-            return match
-                     .DistinctUntilChanged()
-                     .Select(x => x ? RunKeyFrames(animation, control, onComplete) : null)
-                     .Buffer(2, 1)
-                     .Where(x => x.Count > 1)
-                     .Subscribe(x =>
-                        {
-                            if (animation.RepeatCount.IsLoop)
-                                x[0]?.Dispose();
-                        });
+            return match.DistinctUntilChanged()
+                        .Select(x => x ? RunKeyFrames(animation, control, onComplete) : null)
+                        .Buffer(2, 1)
+                        .Where(x => x.Count > 1)
+                        .Subscribe(x => x[0]?.Dispose());
         }
 
         /// <summary>