diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs
index 3b9c2f69823..39e3a6a14a1 100644
--- a/components/style/properties/helpers/animated_properties.mako.rs
+++ b/components/style/properties/helpers/animated_properties.mako.rs
@@ -753,6 +753,7 @@ impl <T> Animatable for Option<T>
             (&Some(ref this), &Some(ref other)) => {
                 Ok(this.add_weighted(other, self_portion, other_portion).ok())
             }
+            (&None, &None) => Ok(None),
             _ => Err(()),
         }
     }
@@ -763,6 +764,7 @@ impl <T> Animatable for Option<T>
             (&Some(ref this), &Some(ref other)) => {
                 this.compute_distance(other)
             },
+            (&None, &None) => Ok(0.0),
             _ => Err(()),
         }
     }