diff --git a/src/main/java/com/troblecodings/signals/signalbox/config/SignalConfig.java b/src/main/java/com/troblecodings/signals/signalbox/config/SignalConfig.java
index 362bf8e0b..9ab782c07 100644
--- a/src/main/java/com/troblecodings/signals/signalbox/config/SignalConfig.java
+++ b/src/main/java/com/troblecodings/signals/signalbox/config/SignalConfig.java
@@ -97,11 +97,12 @@ private static void changeIfPresent(final List<ConfigProperty> values, final Con
                 loadSignalAndRunTask(info.nextinfo, (nextInfo, nextProperties, _u2) -> {
                     changeSignals(values, info, oldProperties, nextProperties);
                     unloadSignal(nextInfo);
+                    unloadSignal(stateInfo);
                 });
             } else {
                 changeSignals(values, info, oldProperties, null);
+                unloadSignal(stateInfo);
             }
-            unloadSignal(stateInfo);
         });
 
     }