Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs
===================================================================
diff -u -rc235d644419c9f398fd806f7dce2592f0974ac97 -rcaa069a8d2f118af9b92dc6db8c5c5bdbdc358fd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs	(.../ConvergenceParser.cs)	(revision c235d644419c9f398fd806f7dce2592f0974ac97)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs	(.../ConvergenceParser.cs)	(revision caa069a8d2f118af9b92dc6db8c5c5bdbdc358fd)
@@ -37,7 +37,8 @@
             $"SELECT ConvOnBeta OR ConvOnValue AS {convergedColumnName} " +
             "FROM IterateToGivenBetaConvergence " +
             $"WHERE SectionId = {sectionIdParameterName} " +
-            "AND OuterIterationId = (SELECT MAX(OuterIterationId) FROM IterateToGivenBetaConvergence);";
+            "ORDER BY OuterIterationId DESC " +
+            "LIMIT 1";
 
         /// <summary>
         /// Gets the value indicating whether the calculation for a section has converged.
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/DunesBoundaryConditionsCalculationParser.cs
===================================================================
diff -u -rc235d644419c9f398fd806f7dce2592f0974ac97 -rcaa069a8d2f118af9b92dc6db8c5c5bdbdc358fd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/DunesBoundaryConditionsCalculationParser.cs	(.../DunesBoundaryConditionsCalculationParser.cs)	(revision c235d644419c9f398fd806f7dce2592f0974ac97)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/DunesBoundaryConditionsCalculationParser.cs	(.../DunesBoundaryConditionsCalculationParser.cs)	(revision caa069a8d2f118af9b92dc6db8c5c5bdbdc358fd)
@@ -42,8 +42,9 @@
                                         $"max(case when OutputVarId is 23 then d.Value end) {waterLevelColumnName} " +
                                         "FROM DesignPointResults as d " +
                                         $"WHERE SectionId = {sectionIdParameterName} " +
-                                        "AND OuterIterationId=(select max(OuterIterationId) FROM DesignPointResults) " +
-                                        "GROUP BY OuterIterationId;";
+                                        "GROUP BY OuterIterationId " +
+                                        "ORDER BY OuterIterationId DESC " +
+                                        "LIMIT 1;";
 
         /// <summary>
         /// Gets the output that was parsed from the output file.