diff --git a/CLI.py b/CLI.py
index eec8327a..dabc7ed1 100644
--- a/CLI.py
+++ b/CLI.py
@@ -156,6 +156,7 @@ def parse_settings():
         "ow_palettes": "default",
         "uw_palettes": "default",
 
+        "suppress_spoiler": True,
         "create_spoiler": False,
         "skip_playthrough": False,
         "calc_playthrough": True,
diff --git a/Utils.py b/Utils.py
index 63670d78..1735dfe6 100644
--- a/Utils.py
+++ b/Utils.py
@@ -251,6 +251,15 @@ def print_wiki_doors_by_region(d_regions, world, player):
 def update_deprecated_args(args):
     argVars = vars(args)
     truthy = [ 1, True, "True", "true" ]
+    # Don't do: Yes
+    # Do:       No
+    if "suppress_spoiler" in argVars:
+        args.create_spoiler = args.suppress_spoiler not in truthy
+    # Don't do: No
+    # Do:       Yes
+    if "create_spoiler" in argVars:
+        args.suppress_spoiler = not args.create_spoiler in truthy
+
     # Don't do: Yes
     # Do:       No
     if "suppress_rom" in argVars:
diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json
index cc639ab5..38cbba8c 100644
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -1,9 +1,14 @@
 {
   "lang": {},
   "create_spoiler": {
-    "action": "store_true",
+    "action": "store_false",
     "type": "bool"
   },
+  "suppress_spoiler": {
+    "action": "store_true",
+    "dest": "create_spoiler",
+    "help": "suppress"
+  },
   "logic": {
     "choices": [
       "noglitches",
diff --git a/resources/app/gui/lang/en.json b/resources/app/gui/lang/en.json
index da499b03..0ea37616 100644
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -154,7 +154,7 @@
     "randomizer.gameoptions.sprite.unchanged": "(unchanged)",
 
 
-    "randomizer.generation.spoiler": "Create Spoiler Log",
+    "randomizer.generation.createspoiler": "Create Spoiler Log",
     "randomizer.generation.createrom": "Create Patched ROM",
     "randomizer.generation.calcplaythrough": "Calculate Playthrough",
     "randomizer.generation.usestartinventory": "Use Starting Inventory",
diff --git a/resources/app/gui/randomize/generation/checkboxes.json b/resources/app/gui/randomize/generation/checkboxes.json
index db020e6d..bb0ef016 100644
--- a/resources/app/gui/randomize/generation/checkboxes.json
+++ b/resources/app/gui/randomize/generation/checkboxes.json
@@ -1,6 +1,6 @@
 {
   "checkboxes": {
-    "spoiler":            { "type": "checkbox" },
+    "createspoiler":      { "type": "checkbox" },
     "createrom":          { "type": "checkbox" },
     "calcplaythrough":    { "type": "checkbox" },
     "usestartinventory":  { "type": "checkbox" },
diff --git a/source/classes/constants.py b/source/classes/constants.py
index e8145f66..1b235800 100644
--- a/source/classes/constants.py
+++ b/source/classes/constants.py
@@ -101,7 +101,7 @@ SETTINGSTOPROCESS = {
       "uwpalettes": "uw_palettes"
     },
     "generation": {
-      "spoiler": "create_spoiler",
+      "createspoiler": "create_spoiler",
       "createrom": "create_rom",
       "calcplaythrough": "calc_playthrough",
       "usestartinventory": "usestartinventory",