diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 19ef26ac0..95840b15c 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -247,9 +247,10 @@ extern "C" void Randomizer_InitSaveFile() {
     Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_TALK_FIRST_TIME);
     Flags_SetInfTable(INFTABLE_RUTO_IN_JJ_WANTS_TO_BE_TOSSED_TO_SAPPHIRE);
 
+    // Now handled by cutscene skips
     // Skip cutscenes before Nabooru fight
-    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
-    Flags_SetEventChkInf(EVENTCHKINF_NABOORU_ORDERED_TO_FIGHT_BY_TWINROVA);
+    // Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
+    // Flags_SetEventChkInf(EVENTCHKINF_NABOORU_ORDERED_TO_FIGHT_BY_TWINROVA);
 
     // Now handled by cutscene skips
     // Skip boss cutscenes
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index cd34e5608..1a349805f 100644
--- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -638,6 +638,43 @@ void TimeSaverOnSceneInitHandler(int16_t sceneNum) {
                 }
             }
             break;
+        case SCENE_FOREST_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_PHANTOM_GANON_BATTLE);
+                }
+            }
+            break;
+        case SCENE_FIRE_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE);
+                }
+            }
+            break;
+        case SCENE_WATER_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_MORPHA_BATTLE);
+                }
+            }
+            break;
+        case SCENE_SPIRIT_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_TWINROVA_BATTLE);
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_NABOORU_BATTLE);
+                    Flags_SetEventChkInf(EVENTCHKINF_NABOORU_ORDERED_TO_FIGHT_BY_TWINROVA);
+                }
+            }
+            break;
+        case SCENE_SHADOW_TEMPLE_BOSS:
+            if (CVarGetInteger("gTimeSavers.SkipCutscene.BossIntro", 0)) {
+                if (!Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE)) {
+                    Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE);
+                }
+            }
+            break;
     }
 }