diff --git a/packages/core/database/lib/fields/json.js b/packages/core/database/lib/fields/json.js
index 8872f2ebbd..1fffcdc101 100644
--- a/packages/core/database/lib/fields/json.js
+++ b/packages/core/database/lib/fields/json.js
@@ -8,7 +8,12 @@ class JSONField extends Field {
   }
 
   fromDB(value) {
-    if (typeof value === 'string') return JSON.parse(value);
+    try {
+      if (typeof value === 'string') return JSON.parse(value);
+    } catch (error) {
+      // Just return the value if it's not a valid JSON string
+      return value;
+    }
     return value;
   }
 }