diff --git a/src/Components/Loader.cpp b/src/Components/Loader.cpp
index 4b610ab0..c6deb6c7 100644
--- a/src/Components/Loader.cpp
+++ b/src/Components/Loader.cpp
@@ -93,7 +93,7 @@ namespace Components
 		Loader::Register(new ZoneBuilder());
 		Loader::Register(new AssetHandler());
 		Loader::Register(new Localization());
-		Loader::Register(new MusicalTalent());
+		//Loader::Register(new MusicalTalent());
 		Loader::Register(new ServerCommands());
 		Loader::Register(new StructuredData());
 		Loader::Register(new ConnectProtocol());
diff --git a/src/Components/Modules/MusicalTalent.cpp b/src/Components/Modules/MusicalTalent.cpp
index 572caa12..668911f5 100644
--- a/src/Components/Modules/MusicalTalent.cpp
+++ b/src/Components/Modules/MusicalTalent.cpp
@@ -17,9 +17,9 @@ namespace Components
 		{
 			Game::snd_alias_list_t* aliases = Game::DB_FindXAssetHeader(type, filename.data()).sound;
 
-			if (aliases)
+			if (aliases && aliases->count > 0 && aliases->head && aliases->head->soundFile)
 			{
-				if (aliases->head->soundFile->type == 2)
+				if (aliases->head->soundFile->type == Game::snd_alias_type_t::SAT_STREAMED)
 				{
 					aliases->head->soundFile->data.stream.name = MusicalTalent::SoundAliasList[Utils::String::ToLower(filename)];
 				}
diff --git a/src/Game/Structs.hpp b/src/Game/Structs.hpp
index 37786ced..47f3c86b 100644
--- a/src/Game/Structs.hpp
+++ b/src/Game/Structs.hpp
@@ -222,14 +222,12 @@ namespace Game
 		const void *initial_ptr;
 	};
 
-	/* 526 */
 	struct MssSound
 	{
 		_AILSOUNDINFO info;
 		char *data;
 	};
 
-	/* 527 */
 	struct LoadedSound
 	{
 		const char *name;
@@ -242,7 +240,7 @@ namespace Game
 		StreamedSound stream;
 	};
 
-	struct SoundFile	// 0xC
+	struct SoundFile
 	{
 		snd_alias_type_t type;
 		bool exists;