diff --git a/mypy.ini b/mypy.ini
index 206ab24..9a79176 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,6 +1,7 @@
 [mypy]
 check_untyped_defs = True
 disallow_any_generics = True
+strict_optional = True
 
 incremental = True
 scripts_are_modules = True
diff --git a/tools/run-mypy b/tools/run-mypy
index 2e01952..de017d3 100755
--- a/tools/run-mypy
+++ b/tools/run-mypy
@@ -110,8 +110,6 @@ parser.add_argument('--no-disallow-untyped-defs', dest='disallow_untyped_defs',
                     help="""Don't throw errors when functions are not annotated""")
 parser.add_argument('--scripts-only', dest='scripts_only', action='store_true', default=False,
                     help="""Only type check extensionless python scripts""")
-parser.add_argument('--no-strict-optional', dest='strict_optional', action='store_false', default=True,
-                    help="""Don't use the --strict-optional flag with mypy""")
 parser.add_argument('--warn-unused-ignores', dest='warn_unused_ignores', action='store_true', default=False,
                     help="""Use the --warn-unused-ignores flag with mypy""")
 parser.add_argument('--no-ignore-missing-imports', dest='ignore_missing_imports', action='store_false', default=True,
@@ -154,8 +152,6 @@ if args.disallow_untyped_defs:
     extra_args.append("--disallow-untyped-defs")
 if args.warn_unused_ignores:
     extra_args.append("--warn-unused-ignores")
-if args.strict_optional:
-    extra_args.append("--strict-optional")
 if args.ignore_missing_imports:
     extra_args.append("--ignore-missing-imports")
 if args.quick: