diff --git a/PKHeX.Core/Legality/Encounters/Templates/Enums/Shiny.cs b/PKHeX.Core/Legality/Encounters/Templates/Enums/Shiny.cs
index ced547cf1..c58526ee3 100644
--- a/PKHeX.Core/Legality/Encounters/Templates/Enums/Shiny.cs
+++ b/PKHeX.Core/Legality/Encounters/Templates/Enums/Shiny.cs
@@ -59,7 +59,7 @@ public static Shiny GetType(PKM pk)
         if (!shiny)
             return Shiny.Never;
 
-        if (IsSquareShinyExist(pk))
+        if (IsSquareShinyExist(pk) && pk.Context.IsSquareShinyDifferentiated)
             return Shiny.AlwaysSquare;
         return Shiny.AlwaysStar;
     }
diff --git a/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs b/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs
index 7585cc876..60ae21ba4 100644
--- a/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs
+++ b/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs
@@ -127,7 +127,7 @@ public Bitmap GetSprite(Bitmap baseSprite, ushort species, int heldItem, bool is
             baseSprite = LayerOverImageItem(baseSprite, heldItem, context);
         if (shiny.IsShiny())
         {
-            if (shiny == Shiny.AlwaysSquare && context.IsSquareShinyDifferentiated)
+            if (shiny == Shiny.AlwaysSquare && !context.IsSquareShinyDifferentiated)
                 shiny = Shiny.Always;
             baseSprite = LayerOverImageShiny(baseSprite, shiny);
         }