diff --git a/src/commands/record-traffic.ts b/src/commands/record-traffic.ts
index f65b32b..16205d6 100644
--- a/src/commands/record-traffic.ts
+++ b/src/commands/record-traffic.ts
@@ -274,6 +274,9 @@ The app can optionally be uninstalled automatically afterwards.`;
                         },
                         {
                             title: 'Waiting for device…',
+                            // If an emulator name is set, we start the emulator in `ensureDevice` and wait there.
+                            // (fixed in https://github.com/tweaselORG/cli/pull/31)
+                            enabled: () => !flags['emulator-name'],
                             task: async () => ctx.analysis.platform.waitForDevice(),
                         },
                         {