diff --git a/src/Geta.Optimizely.GenericLinks/PropertyLinkData.cs b/src/Geta.Optimizely.GenericLinks/PropertyLinkData.cs
index c2d58fe..5d28d73 100644
--- a/src/Geta.Optimizely.GenericLinks/PropertyLinkData.cs
+++ b/src/Geta.Optimizely.GenericLinks/PropertyLinkData.cs
@@ -135,7 +135,7 @@ public override object? Value
 
                 return _linkItem;
             }
-            
+
             set
             {
                 SetPropertyValue(value, delegate
@@ -143,7 +143,7 @@ public override object? Value
                     var linkData = value as TLinkData;
                     if (linkData is not null || value is null)
                     {
-                        _linkItem = linkData;
+                        Link = linkData;
                     }
                     else
                     {
@@ -209,7 +209,7 @@ public override void MakeReadOnly()
             if (!IsReadOnly)
                 _linkItem?.SetModified(false);
 
-            base.MakeReadOnly();            
+            base.MakeReadOnly();
         }
 
         public override PropertyData Copy()
diff --git a/src/Geta.Optimizely.GenericLinks/PropertyLinkDataCollection.cs b/src/Geta.Optimizely.GenericLinks/PropertyLinkDataCollection.cs
index 8ee741a..2e6a7c7 100644
--- a/src/Geta.Optimizely.GenericLinks/PropertyLinkDataCollection.cs
+++ b/src/Geta.Optimizely.GenericLinks/PropertyLinkDataCollection.cs
@@ -134,9 +134,9 @@ public override object? Value
                 {
                     LoadData(base.LongString);
                 }
-                
+
                 return _linkItemCollection;
-            } 
+            }
             set
             {
                 SetPropertyValue(value, delegate
@@ -144,7 +144,7 @@ public override object? Value
                     var collection = value as LinkDataCollection<TLinkData>;
                     if (collection is not null || value is null)
                     {
-                        _linkItemCollection = collection;
+                        Links = collection;
                     }
                     else
                     {