diff --git a/ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp b/ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp
index 6b93ceccf8..7817b76a5b 100644
--- a/ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp
@@ -709,7 +709,7 @@ bool RimGridCalculation::calculateForCases( const std::vector<RimEclipseCase*>&
                 {
                     RiaLogging::error( QString( "  No data found for variable '%1'." ).arg( v->name() ) );
                 }
-                else if ( inputValueVisibilityFilter )
+                else if ( inputValueVisibilityFilter && hasAggregationExpression )
                 {
                     const double defaultValue = 0.0;
                     replaceFilteredValuesWithDefaultValue( defaultValue, inputValueVisibilityFilter, dataForVariable, porosityModel, calculationCase );