diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6f5dbb35..7b378560c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ You can also check the
 - Fix
   - Clicking on Y axis title in bar charts now open Data tab in the details
     panels, as in other chart types
+  - Fixed parsing problems with API routes
 
 ### 6.1.2 - 2025-10-22
 
diff --git a/app/utils/api.ts b/app/utils/api.ts
index 0270e3ae5..eae62b454 100644
--- a/app/utils/api.ts
+++ b/app/utils/api.ts
@@ -23,7 +23,10 @@ export const apiFetch = async <T>(
   );
   const json = await res.json();
   if (json.success) {
-    return json.data && "json" in json.data && "meta" in json.data
+    return "data" in json &&
+      typeof json.data === "object" &&
+      json.data !== null &&
+      "meta" in json.data
       ? (SuperJSON.deserialize(json.data) as T)
       : (json.data as T);
   } else {