diff --git a/BaseClasses.py b/BaseClasses.py
index 1316a99f..c558f6cb 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -51,7 +51,8 @@ class World(object):
         self.clock_mode = 'off'
         self.rupoor_cost = 10
         self.aga_randomness = True
-        self.lock_aga_door_in_escape = False
+        self.lock_aga_door_in_escape = True if logic == 'noglitches' else False
+        self.block_side_exits_escape = True if logic == 'noglitches' and shuffle != 'vanilla' else False
         self.fix_trock_doors = self.shuffle != 'vanilla' or self.mode == 'inverted'
         self.save_and_quit_from_boss = True
         self.accessibility = accessibility
diff --git a/Rom.py b/Rom.py
index 60f08efb..e10c2028 100644
--- a/Rom.py
+++ b/Rom.py
@@ -913,7 +913,7 @@ def patch_rom(world, player, rom):
 
     rom.write_byte(0x18005E, world.crystals_needed_for_gt)
     rom.write_byte(0x18005F, world.crystals_needed_for_ganon)
-    rom.write_byte(0x18008A, 0x01 if world.mode == "standard" else 0x00) # block HC upstairs doors in rain state in standard mode
+    rom.write_byte(0x18008A, 0x01 if world.block_side_exits_escape else 0x00) # block HC upstairs doors in rain state in standard mode
 
      # Bitfield - enable text box to show with free roaming items
      #