diff --git a/vMenu/FunctionsController.cs b/vMenu/FunctionsController.cs
index 4a7e3f9e..95293639 100644
--- a/vMenu/FunctionsController.cs
+++ b/vMenu/FunctionsController.cs
@@ -2343,10 +2343,11 @@ private async Task PlayerOverheadNamesControl()
                 bool enabled = MainMenu.MiscSettingsMenu.MiscShowOverheadNames && IsAllowed(Permission.MSOverheadNames);
                 if (!enabled)
                 {
-                    for (var i = 0; i < 255; i++)
+                    foreach (KeyValuePair<Player, int> gamerTag in gamerTags)
                     {
-                        RemoveMpGamerTag(i);
+                        RemoveMpGamerTag(gamerTag.Value);
                     }
+                    gamerTags.clear();
                 }
                 else
                 {