diff --git a/application/core/filters.py b/application/core/filters.py
index c6022167..a415956d 100644
--- a/application/core/filters.py
+++ b/application/core/filters.py
@@ -166,7 +166,10 @@ def get_entity_name(entity):
 
 
 def digital_land_to_json(dict):
-    filtered_dict = {k: v for k, v in dict.items() if k != "geometry"}
+    filtered_dict = dict.get("row", {})
+    is_truncated = dict.get("is_truncated", False)
+    if is_truncated:
+        filtered_dict = {k: v for k, v in filtered_dict.items() if k != "geometry"}
     # dict["geometry"] = dict["geometry"][:1000]
     return json.dumps(
         filtered_dict, default=str, indent=4, cls=NoneToEmptyStringEncoder
diff --git a/application/templates/entity.html b/application/templates/entity.html
index 12a77aec..c9c6af39 100644
--- a/application/templates/entity.html
+++ b/application/templates/entity.html
@@ -8,12 +8,16 @@
 {%- from "components/entity-field/macro.jinja" import entityField %}
 {%- from "components/back-button/macro.jinja" import dlBackButton %}
 
+{% set is_truncated = false %}
 {% if row['geometry'] %}
-  {% set truncated_geometry = row['geometry'][:10000] %}
-  {% set full_geometry = row['geometry'] %}
+  {% if row['geometry']|length > 10000 %}
+    {% set is_truncated = true %}
+    {% set truncated_geometry = row['geometry'][:10000] %}
+  {% else %}
+    {% set truncated_geometry = row['geometry'] %}
+  {% endif %}
 {% else %}
   {% set truncated_geometry = "" %}
-  {% set full_geometry = "" %}
 {% endif %}
 
 
@@ -29,6 +33,7 @@
 {%- endif %}
 
 {% set geometry_url = "/entity/" + row["entity"] | string + ".geojson" if row['typology'] == "geography" else None %}
+{% set geometry_json_url = "/entity/" + row["entity"] | string + ".json" if row['typology'] == "geography" else None %}
 {% set geojson_data = entity %}
 
 {% if geometry_url or geojson_features %}
@@ -93,7 +98,7 @@ <h1 class="govuk-heading-xl">{{ row_name }}</h1>
                   {% if field == 'geometry' %}
                     <code class ="app-code-block" id="geometry-content">
                       {% if row[field] is not none %}
-                        {{ row[field][:10000] }}{% if row[field]|length > 10000 %}... <a href="javascript:void(0);" onclick="expandGeometry()">Load More</a>{% endif %}
+                        {{ truncated_geometry }}{% if row[field]|length > 10000 %}... <a href="javascript:void(0);" onclick="expandGeometry()">Load More</a>{% endif %}
                       {% endif %}
                       </code>
                     <code class ="app-code-block" id="geometry-full-content" style="display: none;">
@@ -125,8 +130,23 @@ <h1 class="govuk-heading-xl">{{ row_name }}</h1>
         </table>
       {% endcall %}
 
+      {% set data_to_send = {
+        'row': row,
+        'is_truncated': is_truncated
+      } %}
       {% set jsonHTML %}
-        <pre class="govuk-!-margin-0"><code class="language-json app-code-block app-code-block-overflow" tabindex="0">{{ row | digital_land_to_json | safe }}</code></pre>
+      {% if is_truncated %}
+      <a href="{{geometry_json_url}}"
+       class="govuk-button govuk-button--secondary"
+       style="margin-bottom: 10px;"
+       download>
+      Download JSON
+    </a>
+        <pre class="govuk-!-margin-0"><code class="language-json app-code-block app-code-block-overflow" tabindex="0">{{ data_to_send | digital_land_to_json | safe }}
+        </code></pre>
+      {% else %}
+      <pre class="govuk-!-margin-0"><code class="language-json app-code-block app-code-block-overflow" tabindex="0">{{ data_to_send | digital_land_to_json | safe }}</code></pre>
+      {% endif %}
       {% endset %}
       {% set geojsonHTML %}
         <pre class="govuk-!-margin-0"><code class="language-json app-code-block app-code-block-overflow" id="geojson-content" tabindex="0">Loading...</code></pre>
@@ -387,6 +407,14 @@ <h3 class="govuk-heading-s">{{ type|capitalize }}</h3>
                   .catch(error => {
                       console.error('Error loading GeoJSON:', error);
                       geojsonContentElement.innerHTML = 'Error loading GeoJSON content';
+                      // Create and append the download button
+                      const downloadButton = document.createElement('a');
+                      downloadButton.href = '{{ geometry_url }}';
+                      downloadButton.className = 'govuk-button govuk-button--secondary';
+                      downloadButton.style.marginTop = '10px';
+                      downloadButton.textContent = 'Download GeoJSON';
+
+                      geojsonContentElement.parentElement.appendChild(downloadButton);
                   });
           }
       }