diff --git a/src/Ursa/Controls/Badge/Badge.cs b/src/Ursa/Controls/Badge/Badge.cs
index 2003cb4..ced2c10 100644
--- a/src/Ursa/Controls/Badge/Badge.cs
+++ b/src/Ursa/Controls/Badge/Badge.cs
@@ -65,8 +65,6 @@ public class Badge : HeaderedContentControl
 
     static Badge()
     {
-        HeaderProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition());
-        HeaderTemplateProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition());
         CornerPositionProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition());
         DotProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition());
         AffectsArrange<Badge>(HeaderProperty, HeaderTemplateProperty);