diff --git a/Robust.Shared.CompNetworkGenerator/ComponentNetworkGenerator.cs b/Robust.Shared.CompNetworkGenerator/ComponentNetworkGenerator.cs
index 3e8eaa9c13..6f31dc6d4c 100644
--- a/Robust.Shared.CompNetworkGenerator/ComponentNetworkGenerator.cs
+++ b/Robust.Shared.CompNetworkGenerator/ComponentNetworkGenerator.cs
@@ -400,7 +400,7 @@ namespace Robust.Shared.CompNetworkGenerator
                     if ({name}Value == null)
                         component.{name} = null!;
                     else
-                        component.{name} = {nullCast}({name}Value.Clone());");
+                        component.{name} = ({nullCast})({name}Value.Clone());");
                                 shallowClone.Append($@"
                 {name} = this.{name},");
                                 deltaApply.Add($"fullState.{name} = {name} == null ? null! : {name}.Clone();");
@@ -623,6 +623,7 @@ namespace Robust.Shared.CompNetworkGenerator
 
                     [System.Serializable, NetSerializable]
                     [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+                    [RobustAutoGenerated]
                     public sealed class {{stateName}} : IComponentState
                     {
                         {{stateFields}}