diff --git a/src/HassModel/NetDeamon.HassModel/Entities/Entity.cs b/src/HassModel/NetDeamon.HassModel/Entities/Entity.cs
index d46bc562..92554b3c 100644
--- a/src/HassModel/NetDeamon.HassModel/Entities/Entity.cs
+++ b/src/HassModel/NetDeamon.HassModel/Entities/Entity.cs
@@ -43,7 +43,7 @@ public Entity(IEntityCore entity)
     /// <summary>
     /// The current Attributes of this Entity
     /// </summary>
-    public virtual object? Attributes => EntityState?.Attributes;
+    public Dictionary<string, object>? Attributes => EntityState?.Attributes;
 
     /// <summary>
     /// The full state of this Entity
@@ -110,7 +110,7 @@ protected Entity(IHaContext haContext, string entityId) : base(haContext, entity
     { }
 
     /// <inheritdoc />
-    public override TAttributes? Attributes => EntityState?.Attributes;
+    public new virtual TAttributes? Attributes => EntityState?.Attributes;
 
     /// <inheritdoc />
     public override TEntityState? EntityState => MapState(base.EntityState);
diff --git a/src/HassModel/NetDeamon.HassModel/Entities/EntityState.cs b/src/HassModel/NetDeamon.HassModel/Entities/EntityState.cs
index 7200bd42..c612a36b 100644
--- a/src/HassModel/NetDeamon.HassModel/Entities/EntityState.cs
+++ b/src/HassModel/NetDeamon.HassModel/Entities/EntityState.cs
@@ -17,7 +17,7 @@ public record EntityState
     /// <summary>
     /// The attributes
     /// </summary>
-    public virtual object? Attributes => AttributesJson?.Deserialize<Dictionary<string, object>>() ?? [];
+    public Dictionary<string, object>? Attributes => AttributesJson?.Deserialize<Dictionary<string, object>>() ?? [];
 
     /// <summary>Last changed, when state changed from and to different values</summary>
     [JsonPropertyName("last_changed")] public DateTime? LastChanged { get; init; }
@@ -52,5 +52,5 @@ public EntityState(EntityState source) : base(source)
     }
 
     /// <inheritdoc/>
-    public override TAttributes? Attributes => _attributesLazy.Value;
+    public new virtual TAttributes? Attributes => _attributesLazy.Value;
 }