diff --git a/server/accounting/pbs/pbs-job-export.js b/server/accounting/pbs/pbs-job-export.js
index 2d38bb46c..8ba6f8fc1 100644
--- a/server/accounting/pbs/pbs-job-export.js
+++ b/server/accounting/pbs/pbs-job-export.js
@@ -30,7 +30,7 @@ axios.interceptors.request.use((x) => {
   } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
   console.log(printable);
 
-  CdkBase.createLogEvent(socket, "TRACE", `Raw Request: ${printable}`);
+  CdkBase.createJsonEvent(socket, "TRACE", `Raw Request: ${printable}`, x.data);
 
   return x;
 });
@@ -42,7 +42,12 @@ axios.interceptors.response.use((x) => {
     x.data
   )}`;
   console.log(printable);
-  CdkBase.createLogEvent(socket, "TRACE", `Raw Response: ${printable}`);
+  CdkBase.createJsonEvent(
+    socket,
+    "TRACE",
+    `Raw Response: ${printable}`,
+    x.data
+  );
 
   return x;
 });
diff --git a/server/web-sockets/web-socket.js b/server/web-sockets/web-socket.js
index 315cf1c10..e4f3febf9 100644
--- a/server/web-sockets/web-socket.js
+++ b/server/web-sockets/web-socket.js
@@ -17,7 +17,10 @@ const CdkCalculateAllocations =
   require("../cdk/cdk-calculate-allocations").default;
 const { isArray } = require("lodash");
 const logger = require("../utils/logger");
-const {default: PbsExportJob, PbsSelectedCustomer} = require("../accounting/pbs/pbs-job-export");
+const {
+  default: PbsExportJob,
+  PbsSelectedCustomer,
+} = require("../accounting/pbs/pbs-job-export");
 
 io.use(function (socket, next) {
   try {
@@ -159,6 +162,37 @@ function createLogEvent(socket, level, message) {
   }
 }
 
+function createJsonEvent(socket, level, message, json) {
+  if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy(level)) {
+    console.log(
+      `[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${
+        socket.id
+      } - ${message}`
+    );
+    socket.emit("log-event", {
+      timestamp: new Date(),
+      level,
+      message,
+    });
+
+    logger.log("ws-log-event-json", level, socket.user.email, socket.recordid, {
+      wsmessage: message,
+      json
+    });
+
+    if (socket.logEvents && isArray(socket.logEvents)) {
+      socket.logEvents.push({
+        timestamp: new Date(),
+        level,
+        message,
+      });
+    }
+    // if (level === "ERROR") {
+    //   throw new Error(message);
+    // }
+  }
+}
+
 function createXmlEvent(socket, xml, message, isError = false) {
   if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy("TRACE")) {
     socket.emit("log-event", {
@@ -210,3 +244,4 @@ function LogLevelHierarchy(level) {
 
 exports.createLogEvent = createLogEvent;
 exports.createXmlEvent = createXmlEvent;
+exports.createJsonEvent = createJsonEvent;