diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md
index 4c76a6efec..8670fa78d9 100644
--- a/firmware/CHANGELOG.md
+++ b/firmware/CHANGELOG.md
@@ -38,6 +38,7 @@ Release template (copy/paste this for new release):
  - boost control load axis range and rename #6840
  - alphaNUseIat calculations are wrong #6907
  - TPS/PPS Error Detection Threshold visible twice in same dialog #6922
+ - V-Twin MAP phase sense does not need to always wait for sync #6985
 
 ## August 2024 "Day 898"
 
diff --git a/firmware/controllers/limp_manager.cpp b/firmware/controllers/limp_manager.cpp
index c670351697..28d41bdae2 100644
--- a/firmware/controllers/limp_manager.cpp
+++ b/firmware/controllers/limp_manager.cpp
@@ -12,11 +12,6 @@
 static bool noFiringUntilVvtSync(vvt_mode_e vvtMode) {
 	auto operationMode = getEngineRotationState()->getOperationMode();
 
-	// V-Twin MAP phase sense needs to always wait for sync
-	if (vvtMode == VVT_MAP_V_TWIN) {
-		return true;
-	}
-
 	if (engineConfiguration->isPhaseSyncRequiredForIgnition) {
 		// in rare cases engines do not like random sequential mode
 		return true;
diff --git a/unit_tests/tests/trigger/test_map_cam.cpp b/unit_tests/tests/trigger/test_map_cam.cpp
index f2c2baa3fe..e2cda19570 100644
--- a/unit_tests/tests/trigger/test_map_cam.cpp
+++ b/unit_tests/tests/trigger/test_map_cam.cpp
@@ -9,6 +9,8 @@ TEST(trigger, map_cam_by_magic_point) {
 	EngineTestHelper eth(engine_type_e::TEST_CRANK_ENGINE);
 	engineConfiguration->isFasterEngineSpinUpEnabled = false;
 
+  engineConfiguration->isPhaseSyncRequiredForIgnition = true;
+
 	engineConfiguration->camInputs[0] = Gpio::A0;
 	engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN;
 	eth.engine.periodicFastCallback(); // trigger limp mode