diff --git a/source/location_access/locacc_gerudo_training_grounds.cpp b/source/location_access/locacc_gerudo_training_grounds.cpp
index 53242c6bd..63316e2dd 100644
--- a/source/location_access/locacc_gerudo_training_grounds.cpp
+++ b/source/location_access/locacc_gerudo_training_grounds.cpp
@@ -137,7 +137,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
                      // Exits
                      Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER,
                               { [] { return CanUse(MEGATON_HAMMER) && CanUse(BOW); } }),
-                     Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM, { [] { return true; } }),
+                     Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM, { [] { return CanDefeatEnemies(11, 0, 5); } }),
                  });
 
         areaTable[GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER] =
diff --git a/source/location_access/locacc_shadow_temple.cpp b/source/location_access/locacc_shadow_temple.cpp
index 565aaee66..dab0f9d70 100644
--- a/source/location_access/locacc_shadow_temple.cpp
+++ b/source/location_access/locacc_shadow_temple.cpp
@@ -161,7 +161,7 @@ void AreaTable_Init_ShadowTemple() {
                 // Exits
                 Entrance(SHADOW_TEMPLE_WIND_TUNNEL, { [] {
                              return (LogicLensShadowBack || CanUse(LENS_OF_TRUTH)) && Hookshot &&
-                                    SmallKeys(SHADOW_TEMPLE, 3, 4);
+                                    SmallKeys(SHADOW_TEMPLE, 3, 4) && (CanDefeatEnemies(7, 0, 11) || CanUse(LONGSHOT));
                          } }),
             });