diff --git a/BaseClasses.py b/BaseClasses.py
index 37d365c6..e8f13ade 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -64,7 +64,6 @@ class World(object):
         self.dark_world_light_cone = False
         self.clock_mode = 'none'
         self.rupoor_cost = 10
-        self.aga_randomness = True
         self.lock_aga_door_in_escape = False
         self.save_and_quit_from_boss = True
         self.override_bomb_check = False
@@ -171,6 +170,7 @@ class World(object):
             set_player_attr('door_type_mode', 'original')
             set_player_attr('trap_door_mode', 'optional')
             set_player_attr('key_logic_algorithm', 'partial')
+            set_player_attr('aga_randomness', True)
 
             set_player_attr('shopsanity', False)
             set_player_attr('mixed_travel', 'prevent')
diff --git a/CLI.py b/CLI.py
index ac628018..92decc8e 100644
--- a/CLI.py
+++ b/CLI.py
@@ -145,7 +145,7 @@ def parse_cli(argv, no_defaults=False):
                          'heartbeep', 'remote_items', 'shopsanity', 'dropshuffle', 'pottery', 'keydropshuffle',
                          'mixed_travel', 'standardize_palettes', 'code', 'reduce_flashing', 'shuffle_sfx', 'shuffle_songinstruments',
                          'msu_resume', 'collection_rate', 'colorizepots', 'decoupledoors', 'door_type_mode',
-                         'bonk_drops', 'trap_door_mode', 'key_logic_algorithm', 'door_self_loops']:
+                         'bonk_drops', 'trap_door_mode', 'key_logic_algorithm', 'door_self_loops', 'aga_randomness']:
                 value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
                 if player == 1:
                     setattr(ret, name, {1: value})
@@ -235,6 +235,7 @@ def parse_settings():
         "dungeon_counters": "default",
         "mixed_travel": "prevent",
         "standardize_palettes": "standardize",
+        'aga_randomness': True,
         
         "triforce_pool": 0,
         "triforce_goal": 0,
diff --git a/Main.py b/Main.py
index 735942a2..cd6c80f0 100644
--- a/Main.py
+++ b/Main.py
@@ -496,6 +496,7 @@ def init_world(args, fish):
     world.restrict_boss_items = args.restrict_boss_items.copy()
     world.collection_rate = args.collection_rate.copy()
     world.colorizepots = args.colorizepots.copy()
+    world.aga_randomness = args.aga_randomness.copy()
 
     
     return world
diff --git a/Rom.py b/Rom.py
index d6bb10ad..85a7dd67 100644
--- a/Rom.py
+++ b/Rom.py
@@ -1391,7 +1391,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
     rom.write_byte(0x18008F, 0x01 if world.is_atgt_swapped(player) else 0x00) # AT/GT swapped
     rom.write_byte(0xF5D73, 0xF0) # bees are catchable
     rom.write_byte(0xF5F10, 0xF0) # bees are catchable
-    rom.write_byte(0x180086, 0x00 if world.aga_randomness else 0x01)  # set blue ball and ganon warp randomness
+    rom.write_byte(0x180086, 0x00 if world.aga_randomness[player] else 0x01)  # set blue ball and ganon warp randomness
     rom.write_byte(0x1800A0, 0x01)  # return to light world on s+q without mirror
     rom.write_byte(0x1800A1, 0x01)  # enable overworld screen transition draining for water level inside swamp
     rom.write_byte(0x180174, 0x01 if world.fix_fake_world[player] else 0x00)
diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json
index e723ee76..276b581c 100644
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -575,6 +575,10 @@
     "action": "store_true",
     "type": "bool"
   },
+  "aga_randomness": {
+    "action": "store_false",
+    "type": "bool"
+  },
   "settingsonload": {
     "choices": [
       "default",
diff --git a/source/classes/CustomSettings.py b/source/classes/CustomSettings.py
index f15a38f0..0cf93eb3 100644
--- a/source/classes/CustomSettings.py
+++ b/source/classes/CustomSettings.py
@@ -169,6 +169,7 @@ class CustomSettings(object):
                 args.triforce_min_difference[p] = get_setting(settings['triforce_min_difference'], args.triforce_min_difference[p])
                 args.triforce_max_difference[p] = get_setting(settings['triforce_max_difference'], args.triforce_max_difference[p])
                 args.beemizer[p] = get_setting(settings['beemizer'], args.beemizer[p])
+                args.aga_randomness[p] = get_setting(settings['aga_randomness'], args.aga_randomness[p])
 
                 # mystery usage
                 args.usestartinventory[p] = get_setting(settings['usestartinventory'], args.usestartinventory[p])
@@ -326,6 +327,7 @@ class CustomSettings(object):
             settings_dict[p]['triforce_goal'] = world.treasure_hunt_count[p]
             settings_dict[p]['triforce_pool'] = world.treasure_hunt_total[p]
             settings_dict[p]['beemizer'] = world.beemizer[p]
+            settings_dict[p]['aga_randomness'] = world.aga_randomness[p]
             if world.precollected_items:
                 start_inv[p] = []
         for item in world.precollected_items:
diff --git a/source/tools/MysteryUtils.py b/source/tools/MysteryUtils.py
index afaf6108..2b8ba457 100644
--- a/source/tools/MysteryUtils.py
+++ b/source/tools/MysteryUtils.py
@@ -114,6 +114,7 @@ def roll_settings(weights):
     ret.pottery = 'keys' if ret.pottery == 'none' and keydropshuffle else ret.pottery
     ret.colorizepots = get_choice_default('colorizepots', default='on') == 'on'
     ret.shufflepots = get_choice('pot_shuffle') == 'on'
+    ret.aga_randomness = get_choice('aga_randomness') == 'on'
     ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent'
     ret.standardize_palettes = (get_choice('standardize_palettes') if 'standardize_palettes' in weights
                                 else 'standardize')