diff --git a/pkg/expr/classic/classic.go b/pkg/expr/classic/classic.go
index 33e57d5e6a5..29e376238d6 100644
--- a/pkg/expr/classic/classic.go
+++ b/pkg/expr/classic/classic.go
@@ -146,7 +146,6 @@ func (cmd *ConditionsCmd) Execute(_ context.Context, _ time.Time, vars mathexp.V
 			matches = append(matches, EvalMatch{
 				Metric: "NoData",
 			})
-			noDataFound = true
 		}
 
 		firingCount = 0
diff --git a/pkg/expr/classic/classic_test.go b/pkg/expr/classic/classic_test.go
index fd656b2de4a..de159f32f21 100644
--- a/pkg/expr/classic/classic_test.go
+++ b/pkg/expr/classic/classic_test.go
@@ -502,7 +502,6 @@ func TestConditionsCmd(t *testing.T) {
 			return newResults(v)
 		},
 	}, {
-		// TODO: NoData behavior is different if the last condition is no data
 		name: "two queries with two conditions using and operator and last is No Data",
 		vars: mathexp.Vars{
 			"A": mathexp.Results{
@@ -529,7 +528,7 @@ func TestConditionsCmd(t *testing.T) {
 			},
 		},
 		expected: func() mathexp.Results {
-			v := newNumber(nil)
+			v := newNumber(ptr.Float64(0))
 			v.SetMeta([]EvalMatch{{Value: ptr.Float64(5)}, {Metric: "NoData"}})
 			return newResults(v)
 		},