diff --git a/kernelflinger.c b/kernelflinger.c
index fd70a6d7..53783846 100644
--- a/kernelflinger.c
+++ b/kernelflinger.c
@@ -1528,9 +1528,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table)
 #ifndef USER
 	/* WA patch to set device as unlocked by default for userdebug build
 	 */
-#ifdef USE_SBL
 	set_current_state(UNLOCKED);
-#endif
 #else
 	/* For civ, flash images to disk is not MUST. So set device to LOCKED
 	 * state by default on the first boot.