diff --git a/raid/create_raid.cgi b/raid/create_raid.cgi
index d3ce0d0b5..16f23d444 100755
--- a/raid/create_raid.cgi
+++ b/raid/create_raid.cgi
@@ -16,12 +16,14 @@ push(@members, { 'name' => 'raid-level',
 		 'value' => $in{'level'} } );
 push(@members, { 'name' => 'persistent-superblock',
 		 'value' => $in{'super'} } );
-push(@members, { 'name' => 'chunk-size',
-		 'value' => $in{'chunk'} } );
 if ($in{'layout'}) {
 	push(@members, { 'name' => 'parity-algorithm',
 			 'value' => $in{'layout'} } );
 	}
+if ($in{'chunk'}) {
+	push(@members, { 'name' => 'chunk-size',
+			 'value' => $in{'chunk'} } );
+	}
 
 # Add RAID disks
 @disks = split(/\0/, $in{'disks'});
diff --git a/raid/raid-lib.pl b/raid/raid-lib.pl
index 3709a8530..f8f1ad922 100755
--- a/raid/raid-lib.pl
+++ b/raid/raid-lib.pl
@@ -359,11 +359,12 @@ else {
 			push(@parities, $d->{'value'});
 			}
 		}
-	local $cmd = "mdadm --$mode --level $lvl --chunk $chunk";
+	local $cmd = "mdadm --$mode --level $lvl";
 	if ($_[2]) {
 		push(@devices, "missing");
 		}
 	$cmd .= " --layout $layout" if ($layout);
+	$cmd .= " --chunk $chunk" if ($chunk);
 	$cmd .= " --raid-devices ".scalar(@devices);
 	$cmd .= " --spare-devices ".scalar(@spares) if (@spares);
 	$cmd .= " --force" if ($_[1]);