diff --git a/NewHorizons/Builder/Body/StarBuilder.cs b/NewHorizons/Builder/Body/StarBuilder.cs
index bb51b66c..bb50f72e 100644
--- a/NewHorizons/Builder/Body/StarBuilder.cs
+++ b/NewHorizons/Builder/Body/StarBuilder.cs
@@ -192,6 +192,9 @@ namespace NewHorizons.Builder.Body
 
             var stellarRemnant = MakeStellarRemnant(planetGO, sector, starModule);
 
+            controller.SetStellarRemnantController(stellarRemnant);
+
+
             return starController;
         }
 
@@ -227,6 +230,10 @@ namespace NewHorizons.Builder.Body
 
             var stellarRemnant = MakeStellarRemnant(proxyGO, null, starModule);
 
+            planet.GetComponentInChildren<StellarRemnantController>(true).SetProxy(stellarRemnant);
+
+            controller.SetStellarRemnantController(stellarRemnant);
+
             return proxyGO;
         }
 
@@ -359,7 +366,7 @@ namespace NewHorizons.Builder.Body
 
             stellarRemnant.SetActive(true);
 
-            return stellarRemnant;
+            return controller;
         }
     }
 }
diff --git a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
index e99de8df..296884be 100644
--- a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
+++ b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
@@ -27,6 +27,7 @@ namespace NewHorizons.Components.SizeControllers
         private Color _startColour;
         private Color _endColour;
 
+        private StellarRemnantController _stellarRemnantController;
         private PlanetaryFogController _fog;
         private MeshRenderer[] _atmosphereRenderers;
         public HeatHazardVolume _heatVolume;
@@ -433,5 +434,7 @@ namespace NewHorizons.Components.SizeControllers
                 }
             }
         }
+
+        public void SetStellarRemnantController(StellarRemnantController controller) => _stellarRemnantController = controller;
     }
 }
diff --git a/NewHorizons/Components/StellarRemnantController.cs b/NewHorizons/Components/StellarRemnantController.cs
index bf1de1e2..6cca270f 100644
--- a/NewHorizons/Components/StellarRemnantController.cs
+++ b/NewHorizons/Components/StellarRemnantController.cs
@@ -10,6 +10,10 @@ namespace NewHorizons.Components
     {
         private StarEvolutionController _starEvolutionController;
 
+        private StellarRemnantController _proxy;
+
+        public void SetProxy(StellarRemnantController proxy) => _proxy = proxy;
+
         public void SetStarEvolutionController(StarEvolutionController controller) => _starEvolutionController = controller;
     }
 }