diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php
index e7e9cd76a3..a6ab31ef79 100644
--- a/src/usr/local/www/wizard.php
+++ b/src/usr/local/www/wizard.php
@@ -118,9 +118,25 @@ if ($_POST && !$input_errors) {
 	}
 
 	$stepid++;
-	if ($stepid > $totalsteps) {
-		$stepid = $totalsteps;
+}
+
+while (!empty($pkg['step'][$stepid]['skip_flavors'])) {
+	$skip = false;
+	foreach (explode(',', $pkg['step'][$stepid]['skip_flavors']) as $flavor) {
+		if ($flavor == $g['default-config-flavor']) {
+			$skip = true;
+			break;
+		}
 	}
+	if ($skip) {
+		$stepid++;
+	} else {
+		break;
+	}
+}
+
+if ($stepid > $totalsteps) {
+	$stepid = $totalsteps;
 }
 
 $title = preg_replace("/pfSense/i", $g['product_name'], $pkg['step'][$stepid]['title']);