diff --git a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs
index c278f87a3..6a5b7638b 100644
--- a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs
+++ b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs
@@ -128,8 +128,6 @@ private void ClearSeen(int species)
 
         public override void SetDex(PKM pkm)
         {
-            if (SAV.Version == GameVersion.Invalid) // sanity
-                return;
             if ((uint)(pkm.Species - 1) >= (uint)SAV.MaxSpeciesID) // out of range
                 return;
             if (pkm.IsEgg) // do not add
diff --git a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan4.cs b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan4.cs
index cad9833f4..247a4d86b 100644
--- a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan4.cs
+++ b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan4.cs
@@ -281,6 +281,8 @@ public override void SetDex(PKM pkm)
             int species = pkm.Species;
             if (species is 0 or > Legal.MaxSpeciesID_4)
                 return;
+            if (pkm.IsEgg) // do not add
+                return;
 
             var gender = pkm.Gender;
             var form = pkm.Form;
diff --git a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan5.cs b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan5.cs
index 219d45375..6d3f8e581 100644
--- a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan5.cs
+++ b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan5.cs
@@ -67,9 +67,9 @@ protected override void SetAllDexSeenFlags(int baseBit, int form, int gender, bo
 
         public override void SetDex(PKM pkm)
         {
-            if (pkm.Species == 0)
+            if (pkm.Species is 0 or > Legal.MaxSpeciesID_5)
                 return;
-            if (pkm.Species > SAV.MaxSpeciesID)
+            if (pkm.IsEgg) // do not add
                 return;
 
             int bit = pkm.Species - 1;
diff --git a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan6.cs b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan6.cs
index 85a6b4f66..ade1f33f3 100644
--- a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan6.cs
+++ b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan6.cs
@@ -68,13 +68,9 @@ protected override void SetAllDexSeenFlags(int baseBit, int form, int gender, bo
 
         public override void SetDex(PKM pkm)
         {
-            if (PokeDex < 0)
+            if (pkm.Species is 0 or > Legal.MaxSpeciesID_6)
                 return;
-            if (pkm.Species == 0)
-                return;
-            if (pkm.Species > SAV.MaxSpeciesID)
-                return;
-            if (SAV.Version == GameVersion.Invalid)
+            if (pkm.IsEgg) // do not add
                 return;
 
             int bit = pkm.Species - 1;
diff --git a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan8.cs b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan8.cs
index 4c77c14b8..4c1b457f2 100644
--- a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan8.cs
+++ b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan8.cs
@@ -470,6 +470,8 @@ public override void SetDex(PKM pkm)
             int species = pkm.Species;
             if (!GetEntry(species, out _))
                 return;
+            if (pkm.IsEgg) // do not add
+                return;
 
             bool owned = GetCaught(species);