diff --git a/Content.Server/Language/LanguageSystem.cs b/Content.Server/Language/LanguageSystem.cs index f8fb4a18ee1..eb792736f76 100644 --- a/Content.Server/Language/LanguageSystem.cs +++ b/Content.Server/Language/LanguageSystem.cs @@ -68,7 +68,7 @@ private void OnClientSetLanguage(LanguagesSetMessage message, EntitySessionEvent public bool CanUnderstand(Entity ent, ProtoId language) { - if (language == UniversalPrototype || HasComp(ent)) + if (language == UniversalPrototype || TryComp(ent, out var uni) && uni.Enabled) return true; return Resolve(ent, ref ent.Comp, logMissing: false) && ent.Comp.UnderstoodLanguages.Contains(language);