diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp
index 8a25cf1b97..c03046eca7 100644
--- a/firmware/config/engines/custom_engine.cpp
+++ b/firmware/config/engines/custom_engine.cpp
@@ -529,6 +529,8 @@ void setTest33816EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 
 
 	CONFIG(triggerSimulatorPins[0]) = GPIO_UNASSIGNED;
+	CONFIG(triggerSimulatorPins[1]) = GPIO_UNASSIGNED;
+	CONFIG(triggerSimulatorPins[2]) = GPIO_UNASSIGNED;
 
 	// blue
 	CONFIG(mc33816_cs) = GPIOD_7;
diff --git a/firmware/hw_layer/mc33816.cpp b/firmware/hw_layer/mc33816.cpp
index a809360440..70c950e312 100644
--- a/firmware/hw_layer/mc33816.cpp
+++ b/firmware/hw_layer/mc33816.cpp
@@ -354,8 +354,10 @@ void initMc33816(Logging *sharedLogger) {
 	mcRestart();
 }
 
-
 static void mcRestart() {
+	flag0before = false;
+	flag0after = false;
+
 	scheduleMsg(logger, "MC Restart");
 	showStats();
 
@@ -370,8 +372,6 @@ static void mcRestart() {
 	resetB.setValue(1);
 	chThdSleepMilliseconds(10);
     if (CONFIG(mc33816_flag0) != GPIO_UNASSIGNED) {
-   		efiSetPadMode("mc33816 flag0", CONFIG(mc33816_flag0), getInputMode(PI_DEFAULT));
-
    		flag0before = efiReadPin(CONFIG(mc33816_flag0));
     }