diff --git a/core/embed/projects/bootloader/main.c b/core/embed/projects/bootloader/main.c
index 3e1ccbdb2b..1c29f06e2b 100644
--- a/core/embed/projects/bootloader/main.c
+++ b/core/embed/projects/bootloader/main.c
@@ -229,9 +229,6 @@ static void drivers_init(secbool manufacturing_mode,
 
 #ifdef USE_TAMPER
   tamper_init();
-  if (manufacturing_mode != sectrue) {
-    tamper_external_enable();
-  }
 #endif
 
 #ifdef USE_TOUCH
diff --git a/core/embed/projects/kernel/main.c b/core/embed/projects/kernel/main.c
index efaec75d27..36da7392ed 100644
--- a/core/embed/projects/kernel/main.c
+++ b/core/embed/projects/kernel/main.c
@@ -109,6 +109,9 @@ void drivers_init() {
   entropy_init();
 #ifdef USE_TAMPER
   tamper_init();
+#if PRODUCTION
+  tamper_external_enable();
+#endif
 #endif
   random_delays_init();
 #ifdef RDI
diff --git a/core/embed/projects/secmon/main.c b/core/embed/projects/secmon/main.c
index 99dc9c23a1..b48a1beb9a 100644
--- a/core/embed/projects/secmon/main.c
+++ b/core/embed/projects/secmon/main.c
@@ -63,6 +63,9 @@ static void drivers_init(void) {
 
 #ifdef USE_TAMPER
   tamper_init();
+#if PRODUCTION
+  tamper_external_enable();
+#endif
 #endif
 
   random_delays_init();