diff --git a/docs/pages/_en/1.0/reference/release-notes.md b/docs/pages/_en/1.0/reference/release-notes.md
index fce6c2968..17d1f6095 100644
--- a/docs/pages/_en/1.0/reference/release-notes.md
+++ b/docs/pages/_en/1.0/reference/release-notes.md
@@ -21,6 +21,7 @@ group: Deployment & Configs
 - Added 'Appearance Asset Identity' component.
 - Renamed 'Add Linear Dimension' component to 'Add Aligned Dimension'.
 - Fix on 'Host Shape' component when updating.
+- Fix on 'Element Workset' component when the document is not workshared.
 
 {% endcapture %}
 
diff --git a/src/RhinoInside.Revit.GH/Types/Element.cs b/src/RhinoInside.Revit.GH/Types/Element.cs
index 2dc74e27e..160d27946 100755
--- a/src/RhinoInside.Revit.GH/Types/Element.cs
+++ b/src/RhinoInside.Revit.GH/Types/Element.cs
@@ -478,7 +478,7 @@ public virtual ElementType Type
 
     public Workset Workset
     {
-      get => new Workset(Document, Document?.GetWorksetId(Id) ?? ARDB.WorksetId.InvalidWorksetId);
+      get => new Workset(Document, Document.IsWorkshared ? Document?.GetWorksetId(Id) ?? ARDB.WorksetId.InvalidWorksetId : ARDB.WorksetId.InvalidWorksetId);
       set
       {
         if (value is object && Value is ARDB.Element element)