diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go
index e8c327f4a..c50195631 100644
--- a/builder/qemu/step_run.go
+++ b/builder/qemu/step_run.go
@@ -266,13 +266,10 @@ func getCommandArgs(bootDrive string, state multistep.StateBag) ([]string, error
 				arg = defaultArgs[key].([]string)
 			}
 			inArgs[key] = arg
-		}
-	}
-
-	// Check if we are missing the netDevice #6804
-	if x, ok := inArgs["-device"]; ok {
-		if !strings.Contains(strings.Join(x, ""), config.NetDevice) {
-			inArgs["-device"] = append(inArgs["-device"], fmt.Sprintf("%s,netdev=user.0", config.NetDevice))
+		} else {
+			if key == "-device" || key == "-drive" {
+				inArgs[key] = append(defaultArgs[key].([]string), inArgs[key]...)
+			}
 		}
 	}