diff --git a/libraries/APM_OBC/Failsafe_Board/Failsafe_Board.pde b/libraries/APM_OBC/Failsafe_Board/Failsafe_Board.pde
index 384dc0a90cae6ab953cfcc7123cc9ab9e933bd10..d9e419123a0068d74fd092c78db425ab50b21940 100644
--- a/libraries/APM_OBC/Failsafe_Board/Failsafe_Board.pde
+++ b/libraries/APM_OBC/Failsafe_Board/Failsafe_Board.pde
@@ -125,7 +125,7 @@ static void set_servos_terminate(uint8_t obc_mode)
 {
 	set_mux_mode(MUX_MODE_MICRO);
 	if (obc_mode) {
-		set_servos(1100, 1824, 1040, 1131);
+		set_servos(1260, 1730, 1040, 1400);
 	} else {
 		set_servos(1500, 1500, 1200, 1500);
 	}
@@ -254,7 +254,7 @@ void loop()
 		termination_counter++;
 	} else if (heartbeat_backup_ok && terminate_backup) {
 		termination_counter++;
-	} else if (obc_mode && !heartbeat_primary_ok && !heartbeat_backup_ok) {
+	} else if (obc_mode && !heartbeat_primary_ok && !heartbeat_backup_ok && !manual_mode) {
 		// if in OBC mode and neither autopilot is OK, then
 		// terminate
 		termination_counter++;