diff --git a/NewHorizons/Builder/Body/ProxyBuilder.cs b/NewHorizons/Builder/Body/ProxyBuilder.cs
index 1f3ddd3c..c5acd416 100644
--- a/NewHorizons/Builder/Body/ProxyBuilder.cs
+++ b/NewHorizons/Builder/Body/ProxyBuilder.cs
@@ -39,6 +39,7 @@ namespace NewHorizons.Builder.Body
             {
                 proxyController = proxy.AddComponent<NHProxy>();
                 proxyController.astroName = body.Config.name;
+                proxyController._planet = planetGO;
             }
 
             var success = SharedMake(planetGO, proxy, proxyController, body);
diff --git a/NewHorizons/Components/NHProxy.cs b/NewHorizons/Components/NHProxy.cs
index 8a9613ae..42f9cbbf 100644
--- a/NewHorizons/Components/NHProxy.cs
+++ b/NewHorizons/Components/NHProxy.cs
@@ -9,6 +9,7 @@ namespace NewHorizons.Components
     {
         public string astroName;
 
+        public GameObject _planet;
         public GameObject _star;
         private Renderer[] _starRenderers;
         private TessellatedRenderer[] _starTessellatedRenderers;
@@ -79,6 +80,14 @@ namespace NewHorizons.Components
 
         public override void Update()
         {
+            if (_planet == null || !_planet.activeSelf)
+            {
+                _outOfRange = false;
+                ToggleRendering(false);
+                enabled = false;
+                return;
+            }
+
             if (_stellarRemnant != null)
             {
                 if (_stellarRemnant.IsActiveAndEnabled())