diff --git a/device.mk b/device.mk
index e8544f5b..3d3b4bf3 100644
--- a/device.mk
+++ b/device.mk
@@ -95,6 +95,11 @@ 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