diff --git a/TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java b/TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java
index 3721d04..b8890d8 100644
--- a/TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java
+++ b/TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java
@@ -325,10 +325,14 @@ public class TerraChunkGenerator extends ObfHelperChunkGenerator<GenerationSetti
             modifiers.getPredicates().add(Matchers.stoneBlobs(), FeaturePredicate.DENY);
         }
 
+        if (!context.terraSettings.features.vanillaWaterFeatures) {
+            // block lakes and springs if not enabled
+            modifiers.getPredicates().add(FeatureMatcher.of(Feature.LAKE), FeaturePredicate.DENY);
+            modifiers.getPredicates().add(FeatureMatcher.of(Feature.SPRING_FEATURE), FeaturePredicate.DENY);
+        }
+
         // block ugly features
         modifiers.getPredicates().add(Matchers.sedimentDisks(), FeaturePredicate.DENY);
-        modifiers.getPredicates().add(FeatureMatcher.of(Feature.LAKE), FeaturePredicate.DENY);
-        modifiers.getPredicates().add(FeatureMatcher.of(Feature.SPRING_FEATURE), FeaturePredicate.DENY);
 
         // limit to deep oceans
         modifiers.getPredicates().add(FeatureMatcher.of(Feature.SHIPWRECK), MinDepth.DEPTH55);
diff --git a/TerraForgedMod/src/main/java/com/terraforged/mod/settings/FeatureSettings.java b/TerraForgedMod/src/main/java/com/terraforged/mod/settings/FeatureSettings.java
index e623ae5..878f360 100644
--- a/TerraForgedMod/src/main/java/com/terraforged/mod/settings/FeatureSettings.java
+++ b/TerraForgedMod/src/main/java/com/terraforged/mod/settings/FeatureSettings.java
@@ -45,4 +45,7 @@ public class FeatureSettings {
 
     @Comment("Use custom biome features in place of vanilla ones (such as trees)")
     public boolean customBiomeFeatures = true;
+
+    @Comment("Controls whether vanilla lakes & springs should generate")
+    public boolean vanillaWaterFeatures = false;
 }