diff --git a/zone/gm_commands/set/level.cpp b/zone/gm_commands/set/level.cpp
index 549de0b8b..6e88705c4 100644
--- a/zone/gm_commands/set/level.cpp
+++ b/zone/gm_commands/set/level.cpp
@@ -25,6 +25,13 @@ void SetLevel(Client *c, const Seperator *sep)
 	t->SetLevel(level, true);
 
 	if (t->IsClient()) {
+		for (const auto& s : EQ::skills::GetSkillTypeMap()) {
+			const uint16 max_skill_value = t->CastToClient()->MaxSkill(s.first);
+			if (t->GetSkill(s.first) > max_skill_value) {
+				t->CastToClient()->SetSkill(s.first, max_skill_value);
+			}
+		}
+
 		t->CastToClient()->SendLevelAppearance();
 
 		if (RuleB(Bots, Enabled) && RuleB(Bots, BotLevelsWithOwner)) {