diff --git a/etc/rc.d/gbde b/etc/rc.d/gbde
index 6359f415ae80..06c090e02561 100644
--- a/etc/rc.d/gbde
+++ b/etc/rc.d/gbde
@@ -82,12 +82,16 @@ gbde_start()
 		parentdev=${device%.bde}
 		parent=${parentdev#/dev/}
 		eval "lock=\${gbde_lock_${parent}-\"${gbde_lockdir}/${parent}.lock\"}"
-		if [ -e "${lock}" -a ! -e "${device}" ]; then
+		if [ ! -e "${device}" ]; then
 			echo "Configuring Disk Encryption for ${device}."
 
 			count=1
 			while [ ${count} -le ${gbde_attach_attempts} ]; do
-				gbde attach ${parentdev} -l ${lock}
+				if [ -e "${lock}" ]; then
+					gbde attach ${parentdev} -l ${lock}
+				else
+					gbde attach ${parentdev}
+				fi
 				if [ -e ${device} ]; then
 					break
 				fi