diff --git a/Toolkit.Foundation/Activate.cs b/Toolkit.Foundation/Activate.cs
index f1ec74b..cc0c2c6 100644
--- a/Toolkit.Foundation/Activate.cs
+++ b/Toolkit.Foundation/Activate.cs
@@ -2,11 +2,11 @@
 
 public record Activate
 {
-    public static ActivateEventArgs<TValue> As<TValue>(TValue value) => new(value);
+    public static ActivateEventArgs<TValue> As<TValue>(TValue? value) => new(value);
 
     public static ActivateEventArgs<TValue> As<TValue>() where TValue : new() => new(new TValue());
 
-    public static ActivateEventArgs<TKey, TValue> As<TKey, TValue>(TValue value) => new(value);
+    public static ActivateEventArgs<TKey, TValue> As<TKey, TValue>(TValue? value) => new(value);
 
     public static ActivateEventArgs<TKey, TValue> As<TKey, TValue>() where TValue : new() => new(new TValue());
 }
diff --git a/Toolkit.Foundation/ActivateEventArgs.cs b/Toolkit.Foundation/ActivateEventArgs.cs
index af58f68..d9e25c4 100644
--- a/Toolkit.Foundation/ActivateEventArgs.cs
+++ b/Toolkit.Foundation/ActivateEventArgs.cs
@@ -4,7 +4,7 @@ public record ActivateEventArgs<TValue>
 {
     public TValue? Value { get; }
 
-    public ActivateEventArgs(TValue value)
+    public ActivateEventArgs(TValue? value)
     {
         Value = value;
     }
@@ -19,7 +19,7 @@ public record ActivateEventArgs<TKey, TValue>
 {
     public TValue? Value { get; }
 
-    public ActivateEventArgs(TValue value)
+    public ActivateEventArgs(TValue? value)
     {
         Value = value;
     }