diff --git a/JL.Core/Lookup/LookupUtils.cs b/JL.Core/Lookup/LookupUtils.cs
index a37b75ac..06dff079 100644
--- a/JL.Core/Lookup/LookupUtils.cs
+++ b/JL.Core/Lookup/LookupUtils.cs
@@ -1046,12 +1046,13 @@ private static bool WordClassDictionaryContainsTag(string primarySpelling, strin
     {
         if (DictUtils.WordClassDictionary.TryGetValue(primarySpelling, out IList<JmdictWordClass>? jmdictWcResults))
         {
+            bool hasReading = reading is not null;
             for (int i = 0; i < jmdictWcResults.Count; i++)
             {
                 JmdictWordClass result = jmdictWcResults[i];
                 if (primarySpelling == result.Spelling
-                    && ((reading is not null && result.Readings is not null && result.Readings.Contains(reading))
-                        || (reading is null && result.Readings is null))
+                    && ((hasReading && result.Readings is not null && result.Readings.Contains(reading!))
+                        || (!hasReading && result.Readings is null))
                     && result.WordClasses.Contains(tag))
                 {
                     return true;