diff --git a/frontend/src/components/Endpoint/DataFieldTags.tsx b/frontend/src/components/Endpoint/DataFieldTags.tsx
index 13fa0d71..8331e44a 100644
--- a/frontend/src/components/Endpoint/DataFieldTags.tsx
+++ b/frontend/src/components/Endpoint/DataFieldTags.tsx
@@ -70,7 +70,14 @@ export const DataFieldTagList: React.FC<TagListProps> = React.memo(
           >
             Save
           </Button>
-          <Button rounded="sm" size="sm" onClick={() => setEditing(false)}>
+          <Button
+            rounded="sm"
+            size="sm"
+            onClick={() => {
+              setEditing(false)
+              setEditedTags(tags)
+            }}
+          >
             Cancel
           </Button>
         </HStack>
diff --git a/frontend/src/components/Endpoint/TraceDetail.tsx b/frontend/src/components/Endpoint/TraceDetail.tsx
index 52fcbf4d..78ef1237 100644
--- a/frontend/src/components/Endpoint/TraceDetail.tsx
+++ b/frontend/src/components/Endpoint/TraceDetail.tsx
@@ -30,7 +30,7 @@ export const JSONContentViewer = (
 ) => {
   const bgColor = colorMode === "dark" ? "#4C5564" : "#EDF2F7"
   try {
-    const parsedData = JSON.parse(data)
+    const parsedData = JSON.parse(data ?? "{}")
     if (typeof parsedData !== "object" && !Array.isArray(parsedData)) {
       throw new Error()
     }