diff --git a/device.mk b/device.mk
index 68f43139..4c3a5221 100644
--- a/device.mk
+++ b/device.mk
@@ -95,11 +95,6 @@ TRUSTY_KEYMINT_IMPL := rust
 ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
 	# Set the environment variable to enable the Secretkeeper HAL service.
 	SECRETKEEPER_ENABLED := true
-	# TODO(b/341708664): Enable Secretkeeper unconditionally once AOSP targets are built with
-	# compatible bootloader (24Q3+).
-	ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-		SECRETKEEPER_ENABLED := false
-	endif
 endif
 
 # OEM Unlock reporting