Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r52760c1ed98083bbd196a248ecd8e827c11d5841 -rf199c4cf16f21217422a67e938c19839712cd6e4
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 52760c1ed98083bbd196a248ecd8e827c11d5841)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision f199c4cf16f21217422a67e938c19839712cd6e4)
@@ -470,8 +470,7 @@
                    .AddSeparator()
                    .AddClearAllCalculationOutputInGroupItem(
                        () => calculations.Any(c => c.HasOutput),
-                       new WaveConditionsCalculationOutputChangeHandler(
-                           calculations.Where(c => c.HasOutput), inquiryHelper));
+                       CreateClearWaveConditionsCalculationOutputChangeHandler(calculations, inquiryHelper));
 
             if (isNestedGroup)
             {
@@ -618,21 +617,29 @@
 
             WaveImpactAsphaltCoverWaveConditionsCalculation calculation = nodeData.WrappedData;
 
+            IInquiryHelper inquiryHelper = GetInquiryHelper();
+
             return builder.AddExportItem()
                           .AddSeparator()
                           .AddDuplicateCalculationItem(calculation, nodeData)
                           .AddSeparator()
                           .AddRenameItem()
-                          .AddUpdateForeshoreProfileOfCalculationItem(calculation, GetInquiryHelper(),
-                                                                      SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput)
+                          .AddUpdateForeshoreProfileOfCalculationItem(
+                              calculation, inquiryHelper,
+                              SynchronizeCalculationWithForeshoreProfileHelper.UpdateForeshoreProfileDerivedCalculationInput)
                           .AddSeparator()
-                          .AddValidateCalculationItem(nodeData,
-                                                      Validate,
-                                                      EnableValidateAndCalculateMenuItemForCalculation)
+                          .AddValidateCalculationItem(
+                              nodeData, Validate,
+                              EnableValidateAndCalculateMenuItemForCalculation)
                           .AddPerformCalculationItem<WaveImpactAsphaltCoverWaveConditionsCalculation, WaveImpactAsphaltCoverWaveConditionsCalculationContext>(
                               nodeData, Calculate, EnableValidateAndCalculateMenuItemForCalculation)
                           .AddSeparator()
-                          .AddClearCalculationOutputItem(calculation)
+                          .AddClearCalculationOutputItem(
+                              () => calculation.HasOutput,
+                              CreateClearWaveConditionsCalculationOutputChangeHandler(new[]
+                              {
+                                  calculation
+                              }, inquiryHelper))
                           .AddDeleteItem()
                           .AddSeparator()
                           .AddCollapseAllItem()
@@ -686,6 +693,13 @@
             return HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase);
         }
 
+        private static WaveConditionsCalculationOutputChangeHandler CreateClearWaveConditionsCalculationOutputChangeHandler(
+            IEnumerable<WaveImpactAsphaltCoverWaveConditionsCalculation> calculations, IInquiryHelper inquiryHelper)
+        {
+            return new WaveConditionsCalculationOutputChangeHandler(
+                calculations.Where(c => c.HasOutput), inquiryHelper);
+        }
+
         #endregion
     }
 }
\ No newline at end of file