diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3424e5b5..25131483 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
+- NullReferenceErrors when there are missing components, breaking scene view movement (#520)
 
 ### Changed
 
diff --git a/Editor/ChangeStream/ShadowGameObject.cs b/Editor/ChangeStream/ShadowGameObject.cs
index 1fbef4ae..698e4db7 100644
--- a/Editor/ChangeStream/ShadowGameObject.cs
+++ b/Editor/ChangeStream/ShadowGameObject.cs
@@ -812,7 +812,7 @@ internal int[] CurrentComponentStructure
 
                 for (var i = 0; i < comps.Length; i++)
                 {
-                    instanceIds[i] = comps[i].GetInstanceID();
+                    instanceIds[i] = comps[i]?.GetInstanceID() ?? 0;
                 }
 
                 return instanceIds;