diff --git a/public/app/features/query/state/queryAnalytics.ts b/public/app/features/query/state/queryAnalytics.ts
index 51b25443db7..860439ca8e2 100644
--- a/public/app/features/query/state/queryAnalytics.ts
+++ b/public/app/features/query/state/queryAnalytics.ts
@@ -28,6 +28,7 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
       datasourceUid: datasource.uid,
       datasourceType: datasource.type,
       dataSize: 0,
+      panelId: 0,
       duration: data.request.endTime! - data.request.startTime,
     };
 
@@ -60,7 +61,9 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
 
     eventData.totalQueries = Object.keys(queryCacheStatus).length;
     eventData.cachedQueries = Object.values(queryCacheStatus).filter((val) => val === true).length;
-    eventData.panelId = data.request!.panelId;
+    if (data.request && Number.isInteger(data.request.panelId)) {
+      eventData.panelId = data.request.panelId;
+    }
 
     const dashboard = getDashboardSrv().getCurrent();
     if (dashboard) {