diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index aa983a7b7c..bb74de557d 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -140,7 +140,7 @@ static fuel_table_t alphaNfuel = {
  *
  * todo: place this field next to 'engineConfiguration'?
  */
-#ifdef EFI_ACTIVE_CONFIGURATION_IN_FLASH
+#if EFI_ACTIVE_CONFIGURATION_IN_FLASH
 #include "flash_int.h"
 engine_configuration_s & activeConfiguration = reinterpret_cast<persistent_config_container_s*>(getFlashAddrFirstCopy())->persistentConfiguration.engineConfiguration;
 // we cannot use this activeConfiguration until we call rememberCurrentConfiguration()
diff --git a/firmware/hw_layer/debounce.cpp b/firmware/hw_layer/debounce.cpp
index 40ebd19a03..2933cd2e8c 100644
--- a/firmware/hw_layer/debounce.cpp
+++ b/firmware/hw_layer/debounce.cpp
@@ -59,15 +59,15 @@ void ButtonDebounce::stopConfiguration () {
 #else
     if (*m_pin != active_pin || *m_mode != active_mode || (isActiveConfigurationVoid && (*m_pin != 0 || *m_mode != 0))) {
 #endif /* EFI_ACTIVE_CONFIGURATION_IN_FLASH */
-#if ! EFI_UNIT_TEST
+#if EFI_PROD_CODE
     	efiSetPadUnused(active_pin);
-    	needsPinInitialization = true;
 #endif /* EFI_UNIT_TEST */
+    	needsPinInitialization = true;
     }
 }
 
 void ButtonDebounce::startConfiguration () {
-#if ! EFI_UNIT_TEST
+#if EFI_PROD_CODE
     if (needsPinInitialization) {
         efiSetPadMode("Button", *m_pin, getInputMode(*m_mode));
         needsPinInitialization = false;
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 2e9311f0d3..ac9b46bf7e 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -23,6 +23,8 @@
 
 #define SC_BUFFER_SIZE 4000
 
+#define EFI_ACTIVE_CONFIGURATION_IN_FLASH FALSE
+
 #define EFI_BOOST_CONTROL FALSE
 
 #define EFI_CANBUS_SLAVE FALSE