diff --git a/src/Avalonia.Base/Media/MediaContext.Compositor.cs b/src/Avalonia.Base/Media/MediaContext.Compositor.cs
index 6234f36a12..9bdd77960d 100644
--- a/src/Avalonia.Base/Media/MediaContext.Compositor.cs
+++ b/src/Avalonia.Base/Media/MediaContext.Compositor.cs
@@ -43,13 +43,20 @@ partial class MediaContext
             if (_scheduleCommitOnLastCompositionBatchCompletion)
             {
                 _scheduleCommitOnLastCompositionBatchCompletion = false;
-                CommitCompositorsWithThrottling();
+                if (!CommitCompositorsWithThrottling())
+                    ScheduleRenderForAnimationsIfNeeded();
+
             }
             // Check if there are active animations and schedule the next render
-            else if(_clock.HasSubscriptions) 
-                ScheduleRender(false);
+            else
+                ScheduleRenderForAnimationsIfNeeded();
         }
+    }
 
+    void ScheduleRenderForAnimationsIfNeeded()
+    {
+        if (_clock.HasSubscriptions) 
+            ScheduleRender(false);
     }
 
     /// <summary>