diff --git a/floodgatesoftlock.asm b/floodgatesoftlock.asm
index 63e0774..fed7e1f 100644
--- a/floodgatesoftlock.asm
+++ b/floodgatesoftlock.asm
@@ -8,6 +8,11 @@ FloodGateReset:
 		LDA $7EF06E : AND.b #$7F : STA $7EF06E ; clear water room 55
 		LDA $7EF06A : AND.b #$7F : STA $7EF06A ; clear water room 53
 	+
-	LDA $7EF051 : AND.b #$FE : STA $7EF051 ; clear water room 40 - thing we wrote over
+	LDA.l PersistentFloodgate : BNE +
+		LDA $7EF2BB : AND.b #$DF : STA $7EF2BB ; reset water outside floodgate
+		LDA $7EF2FB : AND.b #$DF : STA $7EF2FB ; reset water outside swamp palace
+		LDA $7EF216 : AND.b #$7F : STA $7EF216 ; clear water inside floodgate
+		LDA $7EF051 : AND.b #$FE : STA $7EF051 ; clear water room 40
+	+
 RTL
 ;================================================================================
\ No newline at end of file
diff --git a/hooks.asm b/hooks.asm
index 1f22514..e1e2ea0 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -1524,14 +1524,14 @@ JSL.l FlipperReset
 ;================================================================================
 ; Floodgate Softlock Fix
 ;--------------------------------------------------------------------------------
-org $0AB903 ; <- 53903
+org $0AB8E5 ; <- 538E5
 JSL.l FloodGateAndMasterSwordFollowerReset
 JSL.l IncrementFlute
-NOP #2
+NOP #32
 ;--------------------------------------------------------------------------------
-org $02AAA5 ; <- 12AA5
+org $02AA87 ; <- 12A87
 JSL.l OnOWTransition
-NOP #6
+NOP #36
 ;================================================================================
 
 ;================================================================================
diff --git a/tables.asm b/tables.asm
index e046fcb..890d072 100644
--- a/tables.asm
+++ b/tables.asm
@@ -133,6 +133,10 @@ db #$00 ; #$00 = Always On (default) - #$01 = Require Map Item
 CompassMode:
 db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count
 ;--------------------------------------------------------------------------------
+org $30803D ; PC 0x18003D
+PersistentFloodgate:
+db #$00 ; #$00 = Off (default) - #$01 = On
+;--------------------------------------------------------------------------------
 org $308080 ; PC 0x180080
 Upgrade5BombsRefill:
 db #$00