diff --git a/packages/server/graphql/ResponseStream.ts b/packages/server/graphql/ResponseStream.ts
index 0f4fa374df7..33049450548 100644
--- a/packages/server/graphql/ResponseStream.ts
+++ b/packages/server/graphql/ResponseStream.ts
@@ -44,7 +44,17 @@ export default class ResponseStream implements AsyncIterableIterator<ExecutionRe
     } catch (e) {
       const error =
         e instanceof Error ? e : new Error(`GQL executor failed to publish. docId: ${docId}`)
-      sendToSentry(error, {userId: getUserId(authToken)})
+      sendToSentry(error, {
+        userId: getUserId(authToken),
+        tags: {
+          authToken: JSON.stringify(authToken),
+          docId: docId || '',
+          query: query || '',
+          variables: JSON.stringify(variables),
+          socketServerId: socketId,
+          executorServerId
+        }
+      })
       return this.next()
     }
   }
diff --git a/packages/server/graphql/handleGraphQLTrebuchetRequest.ts b/packages/server/graphql/handleGraphQLTrebuchetRequest.ts
index 3721f51805d..8287c965f98 100644
--- a/packages/server/graphql/handleGraphQLTrebuchetRequest.ts
+++ b/packages/server/graphql/handleGraphQLTrebuchetRequest.ts
@@ -62,7 +62,8 @@ const handleGraphQLTrebuchetRequest = async (
             authToken: JSON.stringify(authToken),
             docId: docId || '',
             query: query || '',
-            variables: JSON.stringify(variables)
+            variables: JSON.stringify(variables),
+            socketServerId: socketId
           }
         })
         return {