diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go
index eba0148e26..ecf407ac5f 100644
--- a/pkg/query-service/app/http_handler.go
+++ b/pkg/query-service/app/http_handler.go
@@ -1545,9 +1545,9 @@ func (aH *APIHandler) registerEvent(w http.ResponseWriter, r *http.Request) {
 		case model.TrackEvent:
 			telemetry.GetInstance().SendEvent(request.EventName, request.Attributes, claims.Email, request.RateLimited, true)
 		case model.GroupEvent:
-			telemetry.GetInstance().SendGroupEvent(request.Attributes)
+			telemetry.GetInstance().SendGroupEvent(request.Attributes, claims.Email)
 		case model.IdentifyEvent:
-			telemetry.GetInstance().SendIdentifyEvent(request.Attributes)
+			telemetry.GetInstance().SendIdentifyEvent(request.Attributes, claims.Email)
 		}
 		aH.WriteJSON(w, r, map[string]string{"data": "Event Processed Successfully"})
 	} else {
diff --git a/pkg/query-service/telemetry/telemetry.go b/pkg/query-service/telemetry/telemetry.go
index 183127c07b..4a7464b2e4 100644
--- a/pkg/query-service/telemetry/telemetry.go
+++ b/pkg/query-service/telemetry/telemetry.go
@@ -425,7 +425,7 @@ func createTelemetry() {
 						"total_metrics_based_panels":  dashboardsInfo.MetricBasedPanels,
 						"total_logs_based_panels":     dashboardsInfo.LogsBasedPanels,
 						"total_traces_based_panels":   dashboardsInfo.TracesBasedPanels,
-					})
+					}, "")
 					telemetry.SendGroupEvent(map[string]interface{}{
 						"total_logs":                  totalLogs,
 						"total_traces":                totalSpans,
@@ -442,7 +442,7 @@ func createTelemetry() {
 						"total_metrics_based_panels":  dashboardsInfo.MetricBasedPanels,
 						"total_logs_based_panels":     dashboardsInfo.LogsBasedPanels,
 						"total_traces_based_panels":   dashboardsInfo.TracesBasedPanels,
-					})
+					}, "")
 				}
 			}
 		}
@@ -451,16 +451,16 @@ func createTelemetry() {
 		}
 
 		if totalLogs > 0 {
-			telemetry.SendIdentifyEvent(map[string]interface{}{"sent_logs": true})
-			telemetry.SendGroupEvent(map[string]interface{}{"sent_logs": true})
+			telemetry.SendIdentifyEvent(map[string]interface{}{"sent_logs": true}, "")
+			telemetry.SendGroupEvent(map[string]interface{}{"sent_logs": true}, "")
 		}
 		if totalSpans > 0 {
-			telemetry.SendIdentifyEvent(map[string]interface{}{"sent_traces": true})
-			telemetry.SendGroupEvent(map[string]interface{}{"sent_traces": true})
+			telemetry.SendIdentifyEvent(map[string]interface{}{"sent_traces": true}, "")
+			telemetry.SendGroupEvent(map[string]interface{}{"sent_traces": true}, "")
 		}
 		if totalSamples > 0 {
-			telemetry.SendIdentifyEvent(map[string]interface{}{"sent_metrics": true})
-			telemetry.SendGroupEvent(map[string]interface{}{"sent_metrics": true})
+			telemetry.SendIdentifyEvent(map[string]interface{}{"sent_metrics": true}, "")
+			telemetry.SendGroupEvent(map[string]interface{}{"sent_metrics": true}, "")
 		}
 
 		getDistributedInfoInLastHeartBeatInterval, _ := telemetry.reader.GetDistributedInfoInLastHeartBeatInterval(ctx)
@@ -591,11 +591,20 @@ func (a *Telemetry) IdentifyUser(user *types.User) {
 	}
 }
 
-func (a *Telemetry) SendIdentifyEvent(data map[string]interface{}) {
+func (a *Telemetry) SendIdentifyEvent(data map[string]interface{}, userEmail string) {
 
 	if !a.isTelemetryEnabled() || a.isTelemetryAnonymous() {
 		return
 	}
+	// ignore telemetry for default user
+	if userEmail == DEFAULT_CLOUD_EMAIL || a.GetUserEmail() == DEFAULT_CLOUD_EMAIL {
+		return
+	}
+
+	if userEmail != "" {
+		a.SetUserEmail(userEmail)
+		a.SetCompanyDomain(userEmail)
+	}
 	traits := analytics.NewTraits()
 
 	for k, v := range data {
@@ -615,11 +624,20 @@ func (a *Telemetry) SendIdentifyEvent(data map[string]interface{}) {
 	}
 }
 
-func (a *Telemetry) SendGroupEvent(data map[string]interface{}) {
+func (a *Telemetry) SendGroupEvent(data map[string]interface{}, userEmail string) {
 
 	if !a.isTelemetryEnabled() || a.isTelemetryAnonymous() {
 		return
 	}
+	// ignore telemetry for default user
+	if userEmail == DEFAULT_CLOUD_EMAIL || a.GetUserEmail() == DEFAULT_CLOUD_EMAIL {
+		return
+	}
+
+	if userEmail != "" {
+		a.SetUserEmail(userEmail)
+		a.SetCompanyDomain(userEmail)
+	}
 	traits := analytics.NewTraits()
 
 	for k, v := range data {