diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff9b28e1..fc523f94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Fixed
+- Fixed another source of NullReferenceErrors after deleting game objects (#522)
 
 ### Changed
 
diff --git a/Editor/ChangeStream/ShadowGameObject.cs b/Editor/ChangeStream/ShadowGameObject.cs
index 698e4db7..1b31280c 100644
--- a/Editor/ChangeStream/ShadowGameObject.cs
+++ b/Editor/ChangeStream/ShadowGameObject.cs
@@ -807,6 +807,8 @@ internal int[] CurrentComponentStructure
         {
             get
             {
+                if (GameObject == null) return Array.Empty<int>();
+                
                 var comps = GameObject.GetComponents<Component>();
                 var instanceIds = new int[comps.Length];