diff --git a/netbox/utilities/forms/fields/fields.py b/netbox/utilities/forms/fields/fields.py index d4d4ae19b..7a3e818f6 100644 --- a/netbox/utilities/forms/fields/fields.py +++ b/netbox/utilities/forms/fields/fields.py @@ -105,7 +105,12 @@ class JSONField(_JSONField): return value if value in ('', None): return '' - return json.dumps(value, sort_keys=True, indent=4) + if type(value) is str: + try: + value = json.loads(value, cls=self.decoder) + except json.decoder.JSONDecodeError: + return value + return json.dumps(value, sort_keys=True, indent=4, ensure_ascii=False, cls=self.encoder) class MACAddressField(forms.Field):