diff --git a/src/BitzArt.Blazor.MVVM/Models/ComponentViewModel.cs b/src/BitzArt.Blazor.MVVM/Models/ComponentViewModel.cs
index 465d021..7481500 100644
--- a/src/BitzArt.Blazor.MVVM/Models/ComponentViewModel.cs
+++ b/src/BitzArt.Blazor.MVVM/Models/ComponentViewModel.cs
@@ -37,7 +37,11 @@ public abstract class ComponentViewModel<TState> : ComponentViewModel, IStateful
     public object ComponentState
     {
         get => State;
-        set => State = (TState)value;
+        set
+        {
+            State = (TState)value;
+            OnStateChanged(State);
+        }
     }
 
     /// <summary>
@@ -57,4 +61,9 @@ public virtual Task InitializeStateAsync()
     {
         return Task.CompletedTask;
     }
+
+    /// <summary>
+    /// Called when the state has changed.
+    /// </summary>
+    protected virtual void OnStateChanged(TState state) { }
 }