diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 53ae2eae727..61bbc04394a 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -133,6 +133,7 @@ func (e *CloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, queryCo
 				result.Results[query.RefId] = &tsdb.QueryResult{
 					Error: err,
 				}
+				return nil
 			}
 			result.Results[queryRes.RefId] = queryRes
 			return nil