diff --git a/NewHorizons/External/Configs/StarSystemConfig.cs b/NewHorizons/External/Configs/StarSystemConfig.cs
index 6a696b53..bd998909 100644
--- a/NewHorizons/External/Configs/StarSystemConfig.cs
+++ b/NewHorizons/External/Configs/StarSystemConfig.cs
@@ -23,8 +23,7 @@ namespace NewHorizons.External.Configs
         /// <summary>
         /// When well past the furthest orbit, should the player be summoned back to the star?
         /// </summary>
-        [DefaultValue(true)]
-        public bool returnToSolarSystemWhenTooFar = true;
+        public bool returnToSolarSystemWhenTooFar;
 
         /// <summary>
         /// An override value for the far clip plane. Allows you to see farther.
diff --git a/NewHorizons/Handlers/CloakHandler.cs b/NewHorizons/Handlers/CloakHandler.cs
index 79bd8c47..f662af4a 100644
--- a/NewHorizons/Handlers/CloakHandler.cs
+++ b/NewHorizons/Handlers/CloakHandler.cs
@@ -1,5 +1,6 @@
 using NewHorizons.Components.EOTE;
 using NewHorizons.OtherMods.VoiceActing;
+using NewHorizons.Utility;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -81,7 +82,8 @@ namespace NewHorizons.Handlers
 
             if (!_cloaks.Any())
             {
-                Locator.RegisterCloakFieldController(null);
+                // For some reason ship/scout HUD markers break if this isn't set to the Stranger when it is disabled #647
+                Locator.RegisterCloakFieldController(GameObject.FindObjectOfType<CloakFieldController>());
                 Shader.DisableKeyword("_CLOAKINGFIELDENABLED");
                 _cloakLocator.SetCurrentCloak(null);
                 _cloakLocator.enabled = false;