diff --git a/src/Nazara/Audio/Music.cpp b/src/Nazara/Audio/Music.cpp
index b5a75b549..566a778d3 100644
--- a/src/Nazara/Audio/Music.cpp
+++ b/src/Nazara/Audio/Music.cpp
@@ -288,7 +288,11 @@ namespace Nz
 			}
 		}
 		else
+		{
+			// Ensure we're restarting
+			Stop();
 			StartThread(false);
+		}
 	}
 
 	/*!