diff --git a/Data/Scripts/003_Game processing/002_Scene_Map.rb b/Data/Scripts/003_Game processing/002_Scene_Map.rb
index a77bafc7f..7309669fb 100644
--- a/Data/Scripts/003_Game processing/002_Scene_Map.rb	
+++ b/Data/Scripts/003_Game processing/002_Scene_Map.rb	
@@ -58,8 +58,10 @@ class Scene_Map
     playingBGS = $game_system.playing_bgs
     return if !playingBGM && !playingBGS
     map = load_data(sprintf("Data/Map%03d.rxdata", mapid))
-    if playingBGM && map.autoplay_bgm && playingBGM.name != map.bgm_name
-      pbBGMFade(0.8)
+    if playingBGM && map.autoplay_bgm
+      test_filename = map.bgm.name
+      test_filename += "_n" if PBDayNight.isNight? && FileTest.audio_exist?("Audio/BGM/" + test_filename + "_n")
+      pbBGMFade(0.8) if playingBGM.name != test_filename
     end
     if playingBGS && map.autoplay_bgs && playingBGS.name != map.bgs.name
       pbBGMFade(0.8)