Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -re90324ad44fdf6e7af3a755239246727123a1591 -r8d2c93e2bc5f1993b9e8e9037f015e7d366ec636
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision e90324ad44fdf6e7af3a755239246727123a1591)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 8d2c93e2bc5f1993b9e8e9037f015e7d366ec636)
@@ -357,7 +357,7 @@
         }
 
         [Test]
-        public void Calculate_CancelCalculationWithValidInput_CancelsCalculator()
+        public void Calculate_CancelCalculationWithValidInput_CancelsCalculatorAndHasNullOutput()
         {
             // Setup
             var heightStructuresFailureMechanism = new HeightStructuresFailureMechanism();
@@ -386,6 +386,7 @@
             {
                 var testStructuresOvertoppingCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator;
                 var service = new HeightStructuresCalculationService();
+                testStructuresOvertoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel();
 
                 // Call
                 service.Calculate(calculation,
@@ -394,9 +395,9 @@
                                   heightStructuresFailureMechanism.GeneralInput,
                                   heightStructuresFailureMechanism.Contribution,
                                   testDataPath);
-                service.Cancel();
 
                 // Assert
+                Assert.IsNull(calculation.Output);
                 Assert.IsTrue(testStructuresOvertoppingCalculator.IsCanceled);
             }
         }