diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py
index b8053493..29d6d564 100644
--- a/worlds/oot/__init__.py
+++ b/worlds/oot/__init__.py
@@ -274,6 +274,9 @@ class OOTWorld(World):
             # Both two-handed swords can be required in glitch logic, so only consider them nonprogression in glitchless
             self.nonadvancement_items.add('Biggoron Sword')
             self.nonadvancement_items.add('Giants Knife')
+            if getattr(self, 'logic_water_central_gs_fw', False):
+                # Farore's Wind skippable if not used for this logic trick in Water Temple
+                self.nonadvancement_items.add('Farores Wind')
   
     def load_regions_from_json(self, file_path):
         region_json = read_json(file_path)