diff --git a/migration/i9/oracle/202203250113_IDEMPIERE-5242.sql b/migration/i9/oracle/202203250113_IDEMPIERE-5242.sql
new file mode 100644
index 0000000000..7c35172403
--- /dev/null
+++ b/migration/i9/oracle/202203250113_IDEMPIERE-5242.sql
@@ -0,0 +1,18 @@
+-- IDEMPIERE-5242 RfQ Issues
+SELECT register_migration_script('202203250113_IDEMPIERE-5242.sql') FROM dual;
+
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Mar 25, 2022, 1:13:22 AM CET
+UPDATE AD_Window SET IsSOTrx='N',Updated=TO_TIMESTAMP('2022-03-25 01:13:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=324
+;
+
+-- Mar 25, 2022, 1:13:28 AM CET
+UPDATE AD_Window SET IsSOTrx='N',Updated=TO_TIMESTAMP('2022-03-25 01:13:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=314
+;
+
+-- Mar 25, 2022, 1:14:03 AM CET
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2022-03-25 01:14:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11032
+;
+
diff --git a/migration/i9/postgresql/202203250113_IDEMPIERE-5242.sql b/migration/i9/postgresql/202203250113_IDEMPIERE-5242.sql
new file mode 100644
index 0000000000..4ef380b65e
--- /dev/null
+++ b/migration/i9/postgresql/202203250113_IDEMPIERE-5242.sql
@@ -0,0 +1,15 @@
+-- IDEMPIERE-5242 RfQ Issues
+SELECT register_migration_script('202203250113_IDEMPIERE-5242.sql') FROM dual;
+
+-- Mar 25, 2022, 1:13:22 AM CET
+UPDATE AD_Window SET IsSOTrx='N',Updated=TO_TIMESTAMP('2022-03-25 01:13:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=324
+;
+
+-- Mar 25, 2022, 1:13:28 AM CET
+UPDATE AD_Window SET IsSOTrx='N',Updated=TO_TIMESTAMP('2022-03-25 01:13:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=314
+;
+
+-- Mar 25, 2022, 1:14:03 AM CET
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2022-03-25 01:14:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11032
+;
+
diff --git a/org.adempiere.base.process/src/org/compiere/process/RfQResponseRank.java b/org.adempiere.base.process/src/org/compiere/process/RfQResponseRank.java
index 302ffaec75..b1895a1815 100644
--- a/org.adempiere.base.process/src/org/compiere/process/RfQResponseRank.java
+++ b/org.adempiere.base.process/src/org/compiere/process/RfQResponseRank.java
@@ -218,10 +218,10 @@ public class RfQResponseRank extends SvrProcess
 						&& respQty.getRfQLineQty().isPurchaseQty())
 					{
 						respLine.setIsSelectedWinner(true);
-						respLine.saveEx();
 						break;
 					}
 				}
+				respLine.saveEx();
 			}
 			response.setRanking(ranking);
 			response.saveEx();