diff --git a/lib/device-controller.ts b/lib/device-controller.ts
index 95a8ff3..9b51e4b 100644
--- a/lib/device-controller.ts
+++ b/lib/device-controller.ts
@@ -119,9 +119,11 @@ export class DeviceManger implements IDeviceManager {
             } catch (error) {
                 console.log(error);
             }
-        }
-
-        if (DeviceManger._emulators.has(args.runType) && !args.reuseDevice && !args.isSauceLab && !args.ignoreDeviceController && args.useDeviceControllerServer) {
+        } else if (DeviceManger._emulators.has(args.runType)
+            && !args.reuseDevice
+            && !args.isSauceLab
+            && !args.ignoreDeviceController
+            && !args.useDeviceControllerServer) {
             const device = DeviceManger._emulators.get(args.runType);
             await DeviceManger.kill(device);
         }