diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
index 34f46f5e68..4cfc14312b 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerObject.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Rendering.Composition.Server
 
             public void Invalidate()
             {
-                if (IsValid)
+                if (!IsValid)
                     return;
                 IsValid = false;
                 if (Subscribers != null)
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
index db8658c7f1..2a49980f96 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
@@ -435,7 +435,8 @@ return;
             "Matrix4x4",
             "Quaternion",
             "Color",
-            "Avalonia.Media.Color"
+            "Avalonia.Media.Color",
+            "Vector3D"
         };
 
         static BlockSyntax ApplyGetProperty(BlockSyntax body, GProperty prop, string? expr = null)