diff --git a/ee/query-service/model/plans.go b/ee/query-service/model/plans.go
index caa2a4df68..5b6f230550 100644
--- a/ee/query-service/model/plans.go
+++ b/ee/query-service/model/plans.go
@@ -52,14 +52,14 @@ var BasicPlan = basemodel.FeatureSet{
 		Name:       basemodel.QueryBuilderPanels,
 		Active:     true,
 		Usage:      0,
-		UsageLimit: 5,
+		UsageLimit: 20,
 		Route:      "",
 	},
 	basemodel.Feature{
 		Name:       basemodel.QueryBuilderAlerts,
 		Active:     true,
 		Usage:      0,
-		UsageLimit: 5,
+		UsageLimit: 10,
 		Route:      "",
 	},
 	basemodel.Feature{
diff --git a/pkg/query-service/model/featureSet.go b/pkg/query-service/model/featureSet.go
index 92aa7b2426..26cd70b908 100644
--- a/pkg/query-service/model/featureSet.go
+++ b/pkg/query-service/model/featureSet.go
@@ -55,14 +55,14 @@ var BasicPlan = FeatureSet{
 		Name:       QueryBuilderPanels,
 		Active:     true,
 		Usage:      0,
-		UsageLimit: 5,
+		UsageLimit: 20,
 		Route:      "",
 	},
 	Feature{
 		Name:       QueryBuilderAlerts,
 		Active:     true,
 		Usage:      0,
-		UsageLimit: 5,
+		UsageLimit: 10,
 		Route:      "",
 	},
 	Feature{
diff --git a/pkg/query-service/telemetry/telemetry.go b/pkg/query-service/telemetry/telemetry.go
index 206e200f5c..4797e7d740 100644
--- a/pkg/query-service/telemetry/telemetry.go
+++ b/pkg/query-service/telemetry/telemetry.go
@@ -244,22 +244,25 @@ func createTelemetry() {
 				telemetry.SendEvent(TELEMETRY_EVENT_HEART_BEAT, data, "")
 
 				alertsInfo, err := telemetry.reader.GetAlertsInfo(context.Background())
-				dashboardsInfo, err := telemetry.reader.GetDashboardsInfo(context.Background())
-
-				if err == nil {
-					dashboardsAlertsData := map[string]interface{}{
-						"totalDashboards":   dashboardsInfo.TotalDashboards,
-						"logsBasedPanels":   dashboardsInfo.LogsBasedPanels,
-						"metricBasedPanels": dashboardsInfo.MetricBasedPanels,
-						"tracesBasedPanels": dashboardsInfo.TracesBasedPanels,
-						"totalAlerts":       alertsInfo.TotalAlerts,
-						"logsBasedAlerts":   alertsInfo.LogsBasedAlerts,
-						"metricBasedAlerts": alertsInfo.MetricBasedAlerts,
-						"tracesBasedAlerts": alertsInfo.TracesBasedAlerts,
-					}
-					telemetry.SendEvent(TELEMETRY_EVENT_DASHBOARDS_ALERTS, dashboardsAlertsData, "")
-				} else {
+				if err != nil {
 					telemetry.SendEvent(TELEMETRY_EVENT_DASHBOARDS_ALERTS, map[string]interface{}{"error": err.Error()}, "")
+				} else {
+					dashboardsInfo, err := telemetry.reader.GetDashboardsInfo(context.Background())
+					if err == nil {
+						dashboardsAlertsData := map[string]interface{}{
+							"totalDashboards":   dashboardsInfo.TotalDashboards,
+							"logsBasedPanels":   dashboardsInfo.LogsBasedPanels,
+							"metricBasedPanels": dashboardsInfo.MetricBasedPanels,
+							"tracesBasedPanels": dashboardsInfo.TracesBasedPanels,
+							"totalAlerts":       alertsInfo.TotalAlerts,
+							"logsBasedAlerts":   alertsInfo.LogsBasedAlerts,
+							"metricBasedAlerts": alertsInfo.MetricBasedAlerts,
+							"tracesBasedAlerts": alertsInfo.TracesBasedAlerts,
+						}
+						telemetry.SendEvent(TELEMETRY_EVENT_DASHBOARDS_ALERTS, dashboardsAlertsData, "")
+					} else {
+						telemetry.SendEvent(TELEMETRY_EVENT_DASHBOARDS_ALERTS, map[string]interface{}{"error": err.Error()}, "")
+					}
 				}
 
 				getDistributedInfoInLastHeartBeatInterval, _ := telemetry.reader.GetDistributedInfoInLastHeartBeatInterval(context.Background())