diff --git a/init.lua b/init.lua
index c394903..fab9372 100644
--- a/init.lua
+++ b/init.lua
@@ -75,8 +75,7 @@ end
 local water = minetest.setting_getbool("dynamic_liquid_water")
 water = water or water == nil -- default true
 
-local river_water = minetest.setting_getbool("dynamic_liquid_river_water")
-river_water = river_water or river_water == nil -- default true
+local river_water = minetest.setting_getbool("dynamic_liquid_river_water") -- default false
 
 local lava = minetest.setting_getbool("dynamic_liquid_lava")
 lava = lava or lava == nil -- default true
diff --git a/settingtypes.txt b/settingtypes.txt
index e8fa4c0..51948e5 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -2,8 +2,10 @@
 #water blocks to move dynamically
 dynamic_liquid_water (Dynamic water) bool true
 
-#Causes river water blocks to move dynamically
-dynamic_liquid_river_water (Dynamic river water) bool true
+#Causes river water blocks to move dynamically. Use caution when using this
+#with the "valleys" mapgen, the streams generated by that mapgen have elevation
+#changes and can make a mess if their water moves downhill uncontrolled.
+dynamic_liquid_river_water (Dynamic river water) bool false
 
 #Causes lava blocks to move dynamically
 dynamic_liquid_lava (Dynamic lava) bool true