Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs
===================================================================
diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r1d6571206d815886a014b0f59f3aae070d46154c
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs	(.../OvertoppingCalculationWaveHeightParser.cs)	(revision 64d60335b1deab4bafd37f78f3514660cc4afb27)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs	(.../OvertoppingCalculationWaveHeightParser.cs)	(revision 1d6571206d815886a014b0f59f3aae070d46154c)
@@ -36,24 +36,26 @@
         private const string isOvertoppingDominantColumn = "IsOvertoppingDominant";
 
         private readonly string query =
-            $"SELECT Value as {waveHeightColumn}," +
-            $"(case when SubMechanismId is 102 then 1 else 0 end) as {isOvertoppingDominantColumn} FROM " +
-            "(SELECT d.OuterIterationId, d.PeriodId, BetaValue, ClosingSituationId, d.WindDirectionId, LevelTypeId, SubMechanismId " +
-            "FROM GoverningWind g " +
-            "JOIN DesignBeta d ON d.WindDirectionId = g.WindDirectionId AND d.OuterIterationId = g.OuterIterationId AND d.PeriodId = g.PeriodId " +
-            $"WHERE LevelTypeId = 7 AND d.SubMechanismId = 102 AND SectionId = {HydraRingDatabaseConstants.SectionIdParameterName} " +
-            "ORDER BY d.OuterIterationId DESC, d.PeriodId, BetaValue " +
-            "LIMIT 1) as g " +
-            "JOIN " +
+            "SELECT " +
             "(SELECT Value FROM GoverningWind g " +
             "JOIN DesignPointResults d ON d.WindDirectionId = g.WindDirectionId AND d.OuterIterationId = g.OuterIterationId AND d.PeriodId = g.PeriodId " +
             "JOIN DesignBeta db ON db.WindDirectionId = d.WindDirectionId AND db.ClosingSituationId = d.ClosingSituationId AND db.OuterIterationId = d.OuterIterationId " +
             "AND db.PeriodId = d.PeriodId " +
             $"WHERE OutputVariableId = 3 AND db.LevelTypeId = 7 AND db.SectionId = {HydraRingDatabaseConstants.SectionIdParameterName} " +
-            "ORDER BY d.OuterIterationId DESC, d.PeriodId, db.BetaValue " +
-            "LIMIT 1) " +
-            "Order By g.BetaValue " +
-            "LIMIT 1;";
+            $"ORDER BY g.OuterIterationId DESC, d.PeriodId, db.BetaValue LIMIT 1) AS {waveHeightColumn}, " +
+            "(SELECT SubMechanismId = 102 " +
+            "FROM DesignBeta db " +
+            "JOIN " +
+            "(SELECT ClosingSituationId, d.PeriodId, d.OuterIterationId, d.WindDirectionId, d.LevelTypeId " +
+            "FROM GoverningWind g " +
+            "JOIN DesignBeta d ON d.WindDirectionId = g.WindDirectionId AND d.OuterIterationId = g.OuterIterationId And d.PeriodId = g.PeriodId " +
+            $"WHERE LevelTypeId = 7 AND SectionId = { HydraRingDatabaseConstants.SectionIdParameterName} " +
+            "AND SubmechanismId = 102 " +
+            "ORDER BY d.OuterIterationId DESC, d.PeriodId, BetaValue " +
+            "LIMIT 1) as s on s.WindDirectionId = db.WindDirectionId AND s.OuterIterationId = db.OuterIterationId AND s.PeriodId = db.PeriodId " +
+            "AND s.ClosingSituationId = db.ClosingSituationId AND s.LevelTypeId = db.LevelTypeId " +
+            "ORDER BY BetaValue " +
+            $"LIMIT 1) AS {isOvertoppingDominantColumn};";
 
         /// <summary>
         /// Gets the output that was parsed from the output file.