diff --git a/Main.py b/Main.py
index fec6996f..93f5b048 100644
--- a/Main.py
+++ b/Main.py
@@ -228,7 +228,9 @@ def main(args, seed=None, fish=None):
         for p, inv_list in world.customizer.get_start_inventory().items():
             if inv_list:
                 for inv_item in inv_list:
-                    item = ItemFactory(inv_item.strip(), p)
+                    name = inv_item.strip()
+                    name = name if name != 'Ocarina' or world.flute_mode[player] != 'active' else 'Ocarina (Activated)'
+                    item = ItemFactory(name, p)
                     if item:
                         world.push_precollected(item)
     if args.print_custom_yaml:
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c083f29d..b1ee524f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -146,6 +146,7 @@ These are now independent of retro mode and have three options: None, Random, an
   * Back of Tavern Shuffle now on by default
   * Enemizer: Wallmasters banned from tiles where spiral staircases are. (Softlock issue)
   * Packaged build of unstable now available
+  * Customizer: Fixed an issue with starting with `Ocarina` and flute_mode is active
   * Fix: HC Big Key drop doesn't count on Basic Doors
   * Fix: Small Key for this dungeon in Hera Basement doesn't count twice for the key counter
   * Fixed a small bug with traversal algorithm