diff --git a/DoorShuffle.py b/DoorShuffle.py
index ee38f00c..588c2857 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -20,6 +20,7 @@ from KeyDoorShuffle import analyze_dungeon, validate_vanilla_key_logic, build_ke
 
 
 def link_doors(world, player):
+    orig_swamp_patch = world.swamp_patch_required[player]
     attempt, valid = 1, False
     while not valid:
         try:
@@ -43,6 +44,7 @@ def link_doors(world, player):
             reset_portals(world, player)
             reset_rooms(world, player)
             world.get_door("Skull Pinball WS", player).no_exit()
+            world.swamp_patch_required[player] = orig_swamp_patch
 
 
 def link_doors_main(world, player):
@@ -467,8 +469,8 @@ def choose_portals(world, player):
                 world.get_room(0xd5, player).change(0, DoorKind.DungeonEntrance)
 
     if not world.swamp_patch_required[player]:
-        swamp_region = world.get_entrance('Swamp Palace', player).connected_region
-        if swamp_region.name != 'Swamp Lobby':
+        swamp_portal = world.get_portal('Swamp', player)
+        if swamp_portal.door.name != 'Swamp Lobby S':
             world.swamp_patch_required[player] = True