diff --git a/leaflet/templates/leaflet/_leaflet_map.html b/leaflet/templates/leaflet/_leaflet_map.html
index 2eab466e..eb914c40 100644
--- a/leaflet/templates/leaflet/_leaflet_map.html
+++ b/leaflet/templates/leaflet/_leaflet_map.html
@@ -2,7 +2,7 @@
 {% load static %}
 {% if creatediv %}<div id="{{ name }}" class="leaflet-container-default"></div>{% endif %}
 
-<script {% if csp_nonce %}nonce="{{ csp_nonce }}"{% endif %}>
+<script nonce="{{ csp_nonce }}">
 (function () {
 
     function loadmap() {
diff --git a/leaflet/templates/leaflet/widget.html b/leaflet/templates/leaflet/widget.html
index 63662f93..3dce00ea 100644
--- a/leaflet/templates/leaflet/widget.html
+++ b/leaflet/templates/leaflet/widget.html
@@ -4,14 +4,14 @@
 {{ FORCE_IMAGE_PATH|json_script:"force-img-path" }}
 {{ reset_view_icon|json_script:"Control-ResetView-ICON" }}
 
-<style {% if csp_nonce %}nonce="{{ csp_nonce }}"{% endif %}>
+<style nonce="{{ csp_nonce }}">
     {% block map_css %}
     {% if map_width and map_height %}#{{ id_map }} { width: {{ map_width|unlocalize }}; height: {{ map_height|unlocalize }}; }{% endif %}
     {% if not display_raw %}#{{ id_css }} { display: none; }{% endif %}
     {% endblock map_css %}
 </style>
 
-<script {% if csp_nonce %}nonce="{{ csp_nonce }}"{% endif %}>
+<script nonce="{{ csp_nonce }}">
     {% block vars %}var {{ module }} = {};
     {{ module }}.fieldid = '{{ id_css }}';
     {{ module }}.modifiable = {{ modifiable|yesno:"true,false" }};