summaryrefslogtreecommitdiff
path: root/django/forms/fields.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms/fields.py')
-rw-r--r--django/forms/fields.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 57886656de..f1275aa387 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -1251,6 +1251,8 @@ class JSONField(CharField):
def bound_data(self, data, initial):
if self.disabled:
return initial
+ if data is None:
+ return None
try:
return json.loads(data, cls=self.decoder)
except json.JSONDecodeError: