diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index c42153ec4f..07b8c1a54e 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -248,7 +248,7 @@ namespace Avalonia.Animation
             {
                 foreach (var setter in keyframe.Setters)
                 {
-                    var handler = GetAnimatorType(setter.Property);
+                    var handler = setter.Animator ?? GetAnimatorType(setter.Property);
 
                     if (handler == null)
                     {
diff --git a/src/Avalonia.Animation/IAnimationSetter.cs b/src/Avalonia.Animation/IAnimationSetter.cs
index 2d22377286..072d7096ae 100644
--- a/src/Avalonia.Animation/IAnimationSetter.cs
+++ b/src/Avalonia.Animation/IAnimationSetter.cs
@@ -1,8 +1,11 @@
+using System;
+
 namespace Avalonia.Animation
 {
     public interface IAnimationSetter
     {
         AvaloniaProperty Property { get; set; }
         object Value { get; set; }
+        Type Animator { get; set; }
     }
 }
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index 1f3d6335a9..114a97dbb6 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -59,6 +59,11 @@ namespace Avalonia.Styling
             }
         }
 
+        /// <summary>
+        /// Gets or sets the property animator.
+        /// </summary>
+        public Type? Animator { get; set; }
+
         public ISetterInstance Instance(IStyleable target)
         {
             target = target ?? throw new ArgumentNullException(nameof(target));