diff --git a/Items/ocarina.asm b/Items/ocarina.asm
index 4bfc503..9e7ab43 100644
--- a/Items/ocarina.asm
+++ b/Items/ocarina.asm
@@ -165,6 +165,7 @@ LinkItem_NewFlute:
 
   .song_of_time
   LDA.b #$27 : JSR $802F ; Player_DoSfx3
+  LDA.b #$02 : STA $FE
   RTS
 
   .song_of_healing
diff --git a/Overworld/time_system.asm b/Overworld/time_system.asm
index c51002d..9ea087e 100644
--- a/Overworld/time_system.asm
+++ b/Overworld/time_system.asm
@@ -148,6 +148,7 @@ RunClock:
   .light_world
   .already_gbc_or_minish
 
+  JSR CheckForSongOfTime
   ; time speed (1,3,5,7,F,1F,3F,7F,FF) 
   ; #$3F is almost 1 sec = 1 game minute
   LDA $1A : AND TimeSpeed : BEQ .increase_minutes ; 05
@@ -214,6 +215,22 @@ RunClock:
   RTS
 }
 
+CheckForSongOfTime:
+{
+  LDA $FE : CMP.b #$02 : BNE +
+    LDA.b #$00 : STA.l $7EE002
+
+    LDA.l $7EE000 : CMP.b #$06 : BNE ++
+      LDA.b #$3F : STA.l $7EE002
+    ++
+
+    LDA.l $7EE000 : CMP.b #$12 : BNE ++
+      LDA.b #$3F : STA.l $7EE002
+    ++
+  +
+  RTS
+}
+
 pushpc
 
 ; =========================================================