diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs
index 1815c890..dbdc50e4 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Player.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs	
@@ -964,6 +964,12 @@ namespace FFXIVClassic_Map_Server.Actors
 
             //Check if bonus point available... set
 
+            //Remove buffs that fall off when changing class
+            CommandResultContainer resultContainer = new CommandResultContainer();
+            statusEffects.RemoveStatusEffectsByFlags((uint)StatusEffectFlags.LoseOnClassChange, resultContainer);
+            resultContainer.CombineLists();
+            DoBattleAction(0, 0x7c000062, resultContainer.GetList());
+
             //Set rested EXP
             charaWork.parameterSave.state_mainSkill[0] = classId;
             charaWork.parameterSave.state_mainSkillLevel = charaWork.battleSave.skillLevel[classId-1];