diff --git a/pmb/flasher/frontend.py b/pmb/flasher/frontend.py
index a9f2bd8a..ee3a7868 100644
--- a/pmb/flasher/frontend.py
+++ b/pmb/flasher/frontend.py
@@ -73,7 +73,6 @@ def list_flavors(args):
 
 def system(args):
     # Generate system image, install flasher
-    flavor = parse_flavor_arg(args)
     img_path = "/home/user/rootfs/" + args.device + ".img"
     if not os.path.exists(args.work + "/chroot_native" + img_path):
         setattr(args, "sdcard", None)
@@ -82,7 +81,7 @@ def system(args):
 
     # Run the flasher
     logging.info("(native) flash system image")
-    pmb.flasher.run(args, "flash_system", flavor)
+    pmb.flasher.run(args, "flash_system")
 
 
 def list_devices(args):
diff --git a/pmb/flasher/run.py b/pmb/flasher/run.py
index 3f57f589..286ff91d 100644
--- a/pmb/flasher/run.py
+++ b/pmb/flasher/run.py
@@ -20,7 +20,7 @@ import pmb.flasher
 import pmb.chroot.initfs
 
 
-def run(args, action, flavor):
+def run(args, action, flavor=None):
     pmb.flasher.init(args)
 
     # Verify action
@@ -39,7 +39,7 @@ def run(args, action, flavor):
     # Variable setup
     vars = {
         "$BOOT": "/mnt/rootfs_" + args.device + "/boot",
-        "$FLAVOR": flavor,
+        "$FLAVOR": flavor if flavor is not None else "",
         "$IMAGE": "/home/user/rootfs/" + args.device + ".img",
         "$KERNEL_CMDLINE": cmdline,
         "$OFFSET_KERNEL": args.deviceinfo["flash_offset_kernel"],