diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp
index c3e18a297e..ff529b43ce 100644
--- a/firmware/config/engines/custom_engine.cpp
+++ b/firmware/config/engines/custom_engine.cpp
@@ -304,7 +304,7 @@ void setTle8888TestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS;
 	engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL;
 
-	engineConfiguration->tle8888_cs = GPIOH_5;
+	engineConfiguration->tle8888_cs = GPIOD_5;
 	engineConfiguration->directSelfStimulation = true;
 
 	boardConfiguration->ignitionPins[0] = GPIOG_3;
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 7fc2c32e25..e7e911956f 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -287,6 +287,10 @@ void applyNewHardwareSettings(void) {
 	}
 #endif /* EFI_ELECTRONIC_THROTTLE_BODY */
 
+#if (BOARD_TLE6240_COUNT > 0)
+	stopSmartCsPins();
+#endif /* (BOARD_MC33972_COUNT > 0) */
+
 #if EFI_VEHICLE_SPEED
 	stopVSSPins();
 #endif /* EFI_VEHICLE_SPEED */
@@ -312,6 +316,10 @@ void applyNewHardwareSettings(void) {
 
 	enginePins.unregisterPins();
 
+#if (BOARD_TLE6240_COUNT > 0)
+	startSmartCsPins();
+#endif /* (BOARD_MC33972_COUNT > 0) */
+
 #if EFI_SHAFT_POSITION_INPUT
 	startTriggerInputPins();
 #endif /* EFI_SHAFT_POSITION_INPUT */
diff --git a/firmware/hw_layer/smart_gpio.cpp b/firmware/hw_layer/smart_gpio.cpp
index ec6fdc400a..c3b1bc8d15 100644
--- a/firmware/hw_layer/smart_gpio.cpp
+++ b/firmware/hw_layer/smart_gpio.cpp
@@ -104,8 +104,8 @@ struct tle8888_config tle8888_cfg = {
 	.spi_config = {
 		.circular = false,
 		.end_cb = NULL,
-		.ssport = GPIOF,
-		.sspad = 0U,
+		.ssport = NULL,
+		.sspad = 0,
 		.cr1 =
 			SPI_CR1_16BIT_MODE |
 			SPI_CR1_SSM |