diff --git a/core/Makefile b/core/Makefile
index 1578c8d16b..ed12a154dd 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -31,6 +31,7 @@ PYOPT      ?= 1
 BITCOIN_ONLY ?= 0
 BOOTLOADER_QA ?= 0
 BOOTLOADER_DEVEL ?= 0
+DISABLE_OPTIGA ?= 0
 TREZOR_MODEL ?= T
 TREZOR_MEMPERF ?= 0
 ADDRESS_SANITIZER ?= 0
diff --git a/core/SConscript.kernel b/core/SConscript.kernel
index 0c0befec5b..ef9ce9e8dd 100644
--- a/core/SConscript.kernel
+++ b/core/SConscript.kernel
@@ -24,7 +24,7 @@ FEATURE_FLAGS = {
 }
 
 FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"]
-if DISABLE_OPTIGA and PYOPT == '0':
+if DISABLE_OPTIGA and not PRODUCTION:
     FEATURES_WANTED.remove("optiga")
 
 CCFLAGS_MOD = ''