diff --git a/rules/alerting.go b/rules/alerting.go
index 1bcf0a0341..2cadd3ac5d 100644
--- a/rules/alerting.go
+++ b/rules/alerting.go
@@ -281,8 +281,8 @@ func (r *AlertingRule) QueryforStateSeries(ctx context.Context, q storage.Querie
 		}
 		matchers = append(matchers, mt)
 	})
-	sset := q.Select(ctx, false, nil, matchers...)
 
+	sset := q.Select(ctx, false, nil, matchers...)
 	return sset, sset.Err()
 }
 
diff --git a/rules/group.go b/rules/group.go
index 81f7b1df2b..7afeaf96e4 100644
--- a/rules/group.go
+++ b/rules/group.go
@@ -676,7 +676,7 @@ func (g *Group) RestoreForState(ts time.Time) {
 		}
 
 		// No results for this alert rule.
-		if err == nil {
+		if sset == nil {
 			level.Debug(g.logger).Log("msg", "Failed to find a series to restore the 'for' state", labels.AlertName, alertRule.Name())
 			continue
 		}