diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index ed993d34d85..386b4e8539c 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -1849,7 +1849,8 @@ export class GameData {
         ret |= DexAttr.DEFAULT_VARIANT;
       }
     } else {
-      ret |= attr & DexAttr.NON_SHINY || !(attr & DexAttr.SHINY) ? DexAttr.NON_SHINY : DexAttr.SHINY;
+      // Default to non shiny. Fallback to shiny if it's the only thing that's unlocked
+      ret |= (attr & DexAttr.NON_SHINY || !(attr & DexAttr.SHINY)) ? DexAttr.NON_SHINY : DexAttr.SHINY;
 
       if (attr & DexAttr.DEFAULT_VARIANT) {
         ret |= DexAttr.DEFAULT_VARIANT;
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index a0b85cc14a0..0f54e9d1637 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1893,7 +1893,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               let newVariant = props.variant;
               do {
                 newVariant = (newVariant + 1) % 3;
-                if (!newVariant) {
+                if (newVariant === 0) {
                   if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.DEFAULT_VARIANT) { // TODO: is this bang correct?
                     break;
                   }