diff --git a/init.lua b/init.lua
index 8f91aca..35a2e83 100644
--- a/init.lua
+++ b/init.lua
@@ -194,5 +194,7 @@ end
 if minetest.settings:get_bool("unified_inventory_item_names") ~= false then
 	dofile(modpath.."/item_names.lua")
 end
-dofile(modpath.."/waypoints.lua")
+if minetest.settings:get_bool("unified_inventory_waypoints") ~= false then
+	dofile(modpath.."/waypoints.lua")
+end
 dofile(modpath.."/legacy.lua") -- mod compatibility
diff --git a/settingtypes.txt b/settingtypes.txt
index f8e5607..4fabbe5 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -10,6 +10,9 @@ unified_inventory_bags (Enable bags) bool true
 # have this slot shown in their inventory.
 unified_inventory_trash (Enable trash) bool true
 
+# Provides waypoints on a per-player basis to remember positions on the map.
+unified_inventory_waypoints (Enable waypoints) bool true
+
 # If enabled, disabled buttons will be hidden instead of grayed out.
 unified_inventory_hide_disabled_buttons (Hide disabled buttons) bool false