diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index 1183b5029c..aa3153e4d8 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -26,22 +26,8 @@ if BENCHMARK and PYOPT != '0':
 FEATURE_FLAGS = {
     "RDI": True,
     "SECP256K1_ZKP": True,  # required for trezor.crypto.curve.bip340 (BIP340/Taproot)
-    "AES_GCM": BENCHMARK,
+    "AES_GCM": BENCHMARK or THP,
 }
-
-
-if THP:
-    FEATURE_FLAGS = {
-        "RDI": True,
-        "SECP256K1_ZKP": True,  # required for trezor.crypto.curve.bip340 (BIP340/Taproot)
-        "AES_GCM": True, # Required for THP encryption
-    }
-else:
-    FEATURE_FLAGS = {
-        "RDI": True,
-        "SECP256K1_ZKP": True,  # required for trezor.crypto.curve.bip340 (BIP340/Taproot)
-        "AES_GCM": False,
-    }
 FEATURES_WANTED = ["input", "sbu", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"]
 if DISABLE_OPTIGA and PYOPT == '0':
     FEATURES_WANTED.remove("optiga")