diff --git a/configs/common/Options.py b/configs/common/Options.py
index 75c60a80ef..31ac120e3e 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -455,7 +455,7 @@ def addSEOptions(parser):
                         "to be used in syscall emulation."
                         "Usage: gem5.opt [...] --redirects /dir1=/path/"
                         "to/host/dir1 --redirects /dir2=/path/to/host/dir2")
-    parser.add_argument("--wait-gdb", default=False,
+    parser.add_argument("--wait-gdb", default=False, action='store_true',
                         help="Wait for remote GDB to connect.")
 
 
diff --git a/configs/example/se.py b/configs/example/se.py
index 65acf6ab97..7b161e120d 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -264,8 +264,7 @@ else:
 system.workload = SEWorkload.init_compatible(mp0_path)
 
 if args.wait_gdb:
-    for cpu in system.cpu:
-        cpu.wait_for_remote_gdb = True
+    system.workload.wait_for_remote_gdb = True
 
 root = Root(full_system = False, system = system)
 Simulation.run(args, root, system, FutureClass)