diff --git a/Main.py b/Main.py
index 33c660f4..bf4bf299 100644
--- a/Main.py
+++ b/Main.py
@@ -113,10 +113,14 @@ def main(args, seed=None):
         if "-" in world.shuffle[player]:
             shuffle, seed = world.shuffle[player].split("-", 1)
             world.shuffle[player] = shuffle
-            if seed.startswith("team-"):
+            if shuffle == "vanilla":
+                world.er_seeds[player] = "vanilla"
+            elif seed.startswith("team-"):
                 world.er_seeds[player] = get_same_seed(world, (shuffle, seed, world.retro[player], world.mode[player], world.logic[player]))
             else:
                 world.er_seeds[player] = seed
+        elif world.shuffle[player] == "vanilla":
+            world.er_seeds[player] = "vanilla"
 
     logger.info('ALttP Berserker\'s Multiworld Version %s  -  Seed: %s\n', __version__, world.seed)
 
diff --git a/Mystery.py b/Mystery.py
index 873893f6..f2531061 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -401,7 +401,10 @@ def roll_settings(weights: dict, plando_options: typing.Set[str] = frozenset(("b
     ret.accessibility = get_choice('accessibility', weights)
 
     entrance_shuffle = get_choice('entrance_shuffle', weights)
-    ret.shuffle = entrance_shuffle if entrance_shuffle != 'none' else 'vanilla'
+    if entrance_shuffle.startswith('none-'):
+        ret.shuffle = 'vanilla'
+    else:
+        ret.shuffle = entrance_shuffle if entrance_shuffle != 'none' else 'vanilla'
 
     goal = get_choice('goals', weights, 'ganon')
     ret.goal = {'ganon': 'ganon',