diff --git a/.github/workflows/staging-deployment.yaml b/.github/workflows/staging-deployment.yaml
index a2ff80354f..4918cf54d2 100644
--- a/.github/workflows/staging-deployment.yaml
+++ b/.github/workflows/staging-deployment.yaml
@@ -31,6 +31,7 @@ jobs:
           GCP_ZONE: ${{ secrets.GCP_ZONE }}
           GCP_INSTANCE: ${{ secrets.GCP_INSTANCE }}
           CLOUDSDK_CORE_DISABLE_PROMPTS: 1
+          KAFKA_SPAN_EVAL: true
         run: |
           read -r -d '' COMMAND <<EOF || true
           echo "GITHUB_BRANCH: ${GITHUB_BRANCH}"
diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go
index f1966c4907..9ce110d545 100644
--- a/pkg/query-service/app/http_handler.go
+++ b/pkg/query-service/app/http_handler.go
@@ -3099,7 +3099,7 @@ func (aH *APIHandler) getPartitionOverviewLatencyData(
 		return
 	}
 
-	queryRangeParams, err := mq.BuildQueryRangeParams(messagingQueue, "partition_latency")
+	queryRangeParams, err := mq.BuildQueryRangeParams(messagingQueue, "producer-topic-throughput")
 	if err != nil {
 		zap.L().Error(err.Error())
 		RespondError(w, apiErr, nil)
diff --git a/pkg/query-service/app/integrations/messagingQueues/kafka/model.go b/pkg/query-service/app/integrations/messagingQueues/kafka/model.go
index 6cddb1521c..de5d83487b 100644
--- a/pkg/query-service/app/integrations/messagingQueues/kafka/model.go
+++ b/pkg/query-service/app/integrations/messagingQueues/kafka/model.go
@@ -5,7 +5,7 @@ const KafkaQueue = "kafka"
 type MessagingQueue struct {
 	Start     int64             `json:"start"`
 	End       int64             `json:"end"`
-	EvalTime  int64             `json:"eval_time"`
+	EvalTime  int64             `json:"eval_time,omitempty"`
 	Variables map[string]string `json:"variables,omitempty"`
 }
 
diff --git a/pkg/query-service/app/integrations/messagingQueues/kafka/translator.go b/pkg/query-service/app/integrations/messagingQueues/kafka/translator.go
index 146fc8bd57..a7d934d5a4 100644
--- a/pkg/query-service/app/integrations/messagingQueues/kafka/translator.go
+++ b/pkg/query-service/app/integrations/messagingQueues/kafka/translator.go
@@ -254,7 +254,6 @@ func BuildClickHouseQuery(messagingQueue *MessagingQueue, queueType string, quer
 	if queryContext == "producer" ||
 		queryContext == "consumer" ||
 		queryContext == "consumer_partition_latency" ||
-		queryContext == "producer-topic-throughput" ||
 		queryContext == "producer-throughput-details" ||
 		queryContext == "consumer-throughput-details" {
 		var ok bool