diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b8e0709..8bf03b43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,12 @@
 1. [](#bugfix)
     * Fixed admin caching issues    
 
+# v1.9.10
+## mm/dd/2019
+
+1. [](#bugfix)
+    * Fixed `Badly encoded JSON data` warning when uploading files [grav#2663](https://github.com/getgrav/grav/issues/2663)
+
 # v1.9.9
 ## 08/21/2019
 
diff --git a/themes/grav/templates/forms/fields/file/file.html.twig b/themes/grav/templates/forms/fields/file/file.html.twig
index 7658b9e6..ccc3953c 100644
--- a/themes/grav/templates/forms/fields/file/file.html.twig
+++ b/themes/grav/templates/forms/fields/file/file.html.twig
@@ -107,7 +107,7 @@
     {% for path, file in value %}
         {{ macro.preview(path, file, _context) }}
     {% endfor %}
-    {% include 'forms/fields/hidden/hidden.html.twig' with {field: {name: '_json.' ~ field.name}, value: value|json_encode} %}
+    {% include 'forms/fields/hidden/hidden.html.twig' with {field: {name: '_json.' ~ field.name}, value: (value ?? [])|json_encode} %}
     </div>
 
     {% else %}