diff --git a/share/hooks/normal/0030-enable-cryptsetup.hook.chroot b/share/hooks/normal/0030-enable-cryptsetup.hook.chroot
index 9d46ccc77..0dc4aaa3e 100755
--- a/share/hooks/normal/0030-enable-cryptsetup.hook.chroot
+++ b/share/hooks/normal/0030-enable-cryptsetup.hook.chroot
@@ -18,4 +18,13 @@ then
 		EOF
 
 	fi
+
+	if [ -e /etc/cryptsetup-initramfs/conf-hook ]; then
+		if grep -q '^#CRYPTSETUP=' /etc/cryptsetup-initramfs/conf-hook; then
+			sed -i -e 's/^#CRYPTSETUP=.*/CRYPTSETUP=y/' \
+			    /etc/cryptsetup-initramfs/conf-hook
+		else
+			echo "CRYPTSETUP=y" >>/etc/cryptsetup-initramfs/conf-hook
+		fi
+	fi
 fi