diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java
index 73bb3f5e..141136bf 100644
--- a/src/com/massivecraft/factions/FPlayer.java
+++ b/src/com/massivecraft/factions/FPlayer.java
@@ -792,7 +792,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 			}
 		}
 		
-		if (LWCFeatures.getEnabled()&& ! forFaction.isSafeZone() && ! forFaction.isWarZone() && Board.getIdAt(flocation) != "0")
+		if (LWCFeatures.getEnabled() && forFaction.isNormal() && Conf.onCaptureResetLwcLocks)
 		{
 			LWCFeatures.clearOtherChests(flocation, this.getFaction());
 		}