diff --git a/EntranceShuffle.py b/EntranceShuffle.py
index e111ddff..cd8df010 100644
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -1446,7 +1446,7 @@ def link_inverted_entrances(world, player):
 
         # shuffle aga door first. if it's on hc ledge, then one other hc ledge door has to be must_exit
         all_entrances_aga = lw_entrances + dw_entrances
-        aga_doors = [i for i in all_entrances_aga]
+        aga_doors = [i for i in all_entrances_aga if world.shufflelinks[player] or i != 'Inverted Links House']
         random.shuffle(aga_doors)
         aga_door = aga_doors.pop()
         
@@ -1589,8 +1589,9 @@ def link_inverted_entrances(world, player):
             hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)', 'Inverted Ganons Tower']
 
         # shuffle aga door. if it's on hc ledge, then one other hc ledge door has to be must_exit
-        aga_door = random.choice(entrances)
-        
+        aga_choices = [x for x in entrances if world.shufflelinks[player] or x != 'Inverted Links House']
+        aga_door = random.choice(aga_choices)
+
         if aga_door in hc_ledge_entrances:
             hc_ledge_entrances.remove(aga_door)