diff --git a/UXAssist/Patches/Factory/BeltSignalPatch.cs b/UXAssist/Patches/Factory/BeltSignalPatch.cs
index 7ec7072..2acee6d 100644
--- a/UXAssist/Patches/Factory/BeltSignalPatch.cs
+++ b/UXAssist/Patches/Factory/BeltSignalPatch.cs
@@ -67,7 +67,7 @@ internal static class BeltSignalPatch
         internal static void ResetState()
         {
             _clusterSeedKey = 0L;
-            _signalBelts = null;
+            _signalBelts = new Dictionary<int, uint>[64];
             SignalBeltFactoryIndices.Clear();
             for (var i = 0; i < DarkFogItemsInVoid.Length; i++)
                 DarkFogItemsInVoid[i] = 0;
diff --git a/UniverseGenTweaks/Patches/GalaxySelectUIPatch.cs b/UniverseGenTweaks/Patches/GalaxySelectUIPatch.cs
index 5b41bda..3ffe269 100644
--- a/UniverseGenTweaks/Patches/GalaxySelectUIPatch.cs
+++ b/UniverseGenTweaks/Patches/GalaxySelectUIPatch.cs
@@ -30,21 +30,14 @@ public static class GalaxySelectUIPatch
     {
         MoreSettings.Enabled.SettingChanged += OnEnabledChanged;
         Enable(MoreSettings.Enabled.Value);
-        GameLogicProc.OnGameEnd += ResetState;
     }
 
     public static void Uninit()
     {
-        GameLogicProc.OnGameEnd -= ResetState;
         MoreSettings.Enabled.SettingChanged -= OnEnabledChanged;
         Enable(false);
     }
 
-    private static void ResetState()
-    {
-        // No per-game mutable fields in this file; UI references are lifecycle-safe.
-    }
-
     private static void OnEnabledChanged(object sender, System.EventArgs e)
     {
         Enable(MoreSettings.Enabled.Value);