diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index 1d6d4c2c..e1d99ef4 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -1321,6 +1321,7 @@ void CallOnTrackChanged(int client, int oldtrack, int newtrack)
 
 	if (oldtrack == Track_Main && oldtrack != newtrack && !DoIHateMain(client))
 	{
+		Shavit_StopChatSound();
 		Shavit_PrintToChat(client, "%T", "TrackChangeFromMain", client, gS_ChatStrings.sVariable, gS_ChatStrings.sText, gS_ChatStrings.sVariable, gS_ChatStrings.sText, gS_ChatStrings.sVariable, gS_ChatStrings.sText);
 	}
 }
diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
index 69ae2971..8d50d5f3 100644
--- a/addons/sourcemod/scripting/shavit-misc.sp
+++ b/addons/sourcemod/scripting/shavit-misc.sp
@@ -1034,6 +1034,7 @@ public Action Timer_Advertisement(Handle timer)
 			ReplaceString(sTempMessage, 300, "{serverip}", sIPAddress);
 			ReplaceString(sTempMessage, 300, "{map}", gS_Map);
 
+			Shavit_StopChatSound();
 			Shavit_PrintToChat(i, "%s", sTempMessage);
 		}
 	}