diff --git a/server/src/lib/logger.js b/server/src/lib/logger.js
index ef594d8..c9f27bf 100644
--- a/server/src/lib/logger.js
+++ b/server/src/lib/logger.js
@@ -27,7 +27,7 @@ async function log({ level, tags = [], message = '', data }, store = true) {
         level,
         tags: tags.toString(),
         message,
-        data: JSON.decycle(data)
+        data: data ? JSON.decycle(data) : null
       }
     })
   } catch (e) {
diff --git a/server/src/resolvers/Log.js b/server/src/resolvers/Log.js
index 5163e94..b31c980 100644
--- a/server/src/resolvers/Log.js
+++ b/server/src/resolvers/Log.js
@@ -1,6 +1,6 @@
 const Log = {
   timestamp: parent => parent.timestamp?.toISOString(),
-  data: parent => JSON.stringify(parent.data),
+  data: parent => (parent.data ? JSON.stringify(parent.data) : null),
   tags: parent => parent.tags?.split(',')
 }