diff --git a/firmware/controllers/algo/engine_type_impl.cpp b/firmware/controllers/algo/engine_type_impl.cpp
index 69256d9b66..f2475bbf5d 100644
--- a/firmware/controllers/algo/engine_type_impl.cpp
+++ b/firmware/controllers/algo/engine_type_impl.cpp
@@ -324,6 +324,12 @@ void applyEngineType(engine_type_e engineType) {
 		testEngine6451();
 		break;
 
+#if defined(HW_FRANKENSO) || EFI_SIMULATOR || defined(HW_NUCLEO_F767) || defined(HW_NUCLEO_H743) || defined(SUPPORT_GY6)
+	case engine_type_e::GY6_139QMB:
+		setGy6139qmbDefaultEngineConfiguration();
+		break;
+#endif
+
 #if defined(HW_FRANKENSO) || EFI_SIMULATOR || defined(HW_NUCLEO_F767) || defined(HW_NUCLEO_H743)
 	case engine_type_e::DEFAULT_FRANKENSO:
 		setFrankensoConfiguration();
@@ -374,9 +380,6 @@ void applyEngineType(engine_type_e engineType) {
 	case engine_type_e::FORD_INLINE_6_1995:
 		setFordInline6();
 		break;
-	case engine_type_e::GY6_139QMB:
-		setGy6139qmbDefaultEngineConfiguration();
-		break;
 	case engine_type_e::HONDA_600:
 		setHonda600();
 		break;