diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 506f8c6c..afcfef75 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2164,7 +2164,7 @@ openLUKS() {
 			fi
 
 			# At this point, {header,key}file or not, we're ready!
-			crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}" "${ASK_PASS}"
+			crypt_filter "${gpg_cmd}cryptsetup${cryptsetup_options:+ }${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}" "${ASK_PASS}"
 			crypt_filter_ret=$?
 
 			[ -e /dev/tty.org ] \
diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 54ed1a04..12c155c1 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -97,7 +97,7 @@ main() {
 				fi
 
 				# At this point, keyfile or not, we're ready!
-				crypt_filter "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
+				crypt_filter "${gpg_cmd}cryptsetup${cryptsetup_options:+ }${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
 				crypt_filter_ret=$?
 
 				[ -e /dev/tty.org ] \