Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql
===================================================================
diff -u -r0673ac0dfa6de62d2114da6112338df0f7b11300 -r0c403128070d9fec5dd98bcef536c3d9bc0e50bf
--- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql	(.../Migration_17.3_18.1.sql)	(revision 0673ac0dfa6de62d2114da6112338df0f7b11300)
+++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql	(.../Migration_17.3_18.1.sql)	(revision 0c403128070d9fec5dd98bcef536c3d9bc0e50bf)
@@ -1988,21 +1988,16 @@
 	'NrRemaining' INTEGER NOT NULL
 );
 INSERT INTO TempLogOutputRemaining
-SELECT COUNT()
-	FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity
-	WHERE MacroStabilityInwardsCalculationEntityId IN (
-		SELECT MacroStabilityInwardsCalculationEntityId
-		FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity
-		WHERE UseAssessmentLevelManualInput IS 1
-	);
-INSERT INTO TempLogOutputRemaining
-SELECT COUNT()
-	FROM [SOURCEPROJECT].PipingCalculationOutputEntity
-	WHERE PipingCalculationEntityId IN (
-		SELECT PipingCalculationEntityId
-		FROM [SOURCEPROJECT].PipingCalculationEntity
-		WHERE UseAssessmentLevelManualInput IS 1
-	);
+SELECT COUNT() + 
+(
+    SELECT COUNT()
+    FROM [SOURCEPROJECT].PipingCalculationOutputEntity
+    JOIN [SOURCEPROJECT].PipingCalculationEntity USING(PipingCalculationEntityId)
+    WHERE UseAssessmentLevelManualInput = 1 
+)
+FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity
+JOIN [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity USING(MacroStabilityInwardsCalculationEntityId)
+WHERE UseAssessmentLevelManualInput = 1;
 
 INSERT INTO [LOGDATABASE].MigrationLogEntity (
 	[FromVersion],