diff --git a/P3D/Content/Data/maps/quest/dock.dat b/P3D/Content/Data/maps/quest/dock.dat
index 0f39f8975..1378ab5c7 100644
--- a/P3D/Content/Data/maps/quest/dock.dat
+++ b/P3D/Content/Data/maps/quest/dock.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Seven Island]}}{"MusicLoop"{str[]}}{"CurrentRegion"{str[sevii islands]}}]}}
+{"Level"{LEV[{"Name"{str[Seven Island]}}{"MusicLoop"{str[violet]}}{"CurrentRegion"{str[sevii islands]}}]}}
 {"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
diff --git a/P3D/Resources/Sound/MusicManager.vb b/P3D/Resources/Sound/MusicManager.vb
index 87f8a0a78..12f9401a5 100644
--- a/P3D/Resources/Sound/MusicManager.vb
+++ b/P3D/Resources/Sound/MusicManager.vb
@@ -131,6 +131,10 @@ Public Class MusicManager
                         ClearCurrentlyPlaying()
                         _isFadingIn = False
                         _volume = 1.0F
+                        If _nextSong = NO_MUSIC Then
+                            MusicManager.Stop()
+                            _nextSong = ""
+                        End If
 
                     End If
 
diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe
index aa3ecb27d..4a94299b3 100644
Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ