diff --git a/Meta/run.py b/Meta/run.py
index 2840bc6d75..ef55546654 100755
--- a/Meta/run.py
+++ b/Meta/run.py
@@ -694,6 +694,11 @@ def setup_kernel(config: Configuration):
 def setup_machine_devices(config: Configuration):
     # TODO: Maybe disable SPICE everwhere except the default machine?
 
+    if config.qemu_kind != QEMUKind.NativeWindows:
+        config.extra_arguments.extend(["-qmp", "unix:qmp-sock,server,nowait"])
+
+    config.extra_arguments.extend(["-name", "SerenityOS", "-d", "guest_errors"])
+
     # Architecture specifics.
     if config.architecture == Arch.Aarch64:
         config.qemu_machine = "raspi3b"
@@ -804,11 +809,6 @@ def setup_machine_devices(config: Configuration):
         case MachineType.QEMUGrub | MachineType.QEMUExtLinux:
             config.kernel_cmdline = []
 
-    if config.qemu_kind != QEMUKind.NativeWindows:
-        config.extra_arguments.extend(["-qmp", "unix:qmp-sock,server,nowait"])
-
-    config.extra_arguments.extend(["-name", "SerenityOS", "-d", "guest_errors"])
-
 
 def assemble_arguments(config: Configuration) -> list[str | Path]:
     if config.machine_type == MachineType.Bochs: