diff --git a/rangefilter/templates/rangefilter/date_filter.html b/rangefilter/templates/rangefilter/date_filter.html
index a74780d..17f5ee8 100644
--- a/rangefilter/templates/rangefilter/date_filter.html
+++ b/rangefilter/templates/rangefilter/date_filter.html
@@ -62,10 +62,10 @@
         }
     }
 </style>
-<!--
+{% comment %}
 Force load jsi18n, issues #5
 https://github.com/django/django/blob/stable/1.10.x/django/contrib/admin/templates/admin/change_list.html#L7
--->
+{% endcomment %}
 <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
 <script>
     function datefilter_apply(event, qs_name, form_name){
@@ -80,6 +80,7 @@ https://github.com/django/django/blob/stable/1.10.x/django/contrib/admin/templat
     }
 </script>
 <script>
+    {% comment %}
     // Code below makes sure that the DateTimeShortcuts.js is loaded exactly once
     // regardless the presence of AdminDateWidget
     // How it worked:
@@ -106,7 +107,7 @@ https://github.com/django/django/blob/stable/1.10.x/django/contrib/admin/templat
     //
     // Django 2.1
     //  https://github.com/silentsokolov/django-admin-rangefilter/issues/21
-    //
+    {% endcomment %}
     django.jQuery('document').ready(function () {
         if (!('DateTimeShortcuts' in window)) {
             django.jQuery.when(
diff --git a/rangefilter/templates/rangefilter/date_filter_1_8.html b/rangefilter/templates/rangefilter/date_filter_1_8.html
index 9071f31..b3e7433 100644
--- a/rangefilter/templates/rangefilter/date_filter_1_8.html
+++ b/rangefilter/templates/rangefilter/date_filter_1_8.html
@@ -51,10 +51,10 @@
         margin-bottom: 2px;
     }
 </style>
-<!--
+{% comment %}
 Force load jsi18n, issues #5
 https://github.com/django/django/blob/stable/1.8.x/django/contrib/admin/templates/admin/change_list.html#L7
--->
+{% endcomment %}
 <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
 <script>
     function datefilter_apply(event, qs_name, form_name){
diff --git a/rangefilter/templates/rangefilter/date_filter_csp.html b/rangefilter/templates/rangefilter/date_filter_csp.html
index 479bd9c..5bb70d0 100644
--- a/rangefilter/templates/rangefilter/date_filter_csp.html
+++ b/rangefilter/templates/rangefilter/date_filter_csp.html
@@ -63,13 +63,14 @@
     }
 </style>
 
-<!--
+{% comment %}
 Force load jsi18n, issues #5
 https://github.com/django/django/blob/stable/1.10.x/django/contrib/admin/templates/admin/change_list.html#L7
--->
+{% endcomment %}
 <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
 
 <script type="text/javascript" nonce="{{ spec.request.csp_nonce }}">
+{% comment %}
 // Code below makes sure that the DateTimeShortcuts.js is loaded exactly once
 // regardless the presence of AdminDateWidget
 // How it worked:
@@ -98,6 +99,7 @@ https://github.com/django/django/blob/stable/1.10.x/django/contrib/admin/templat
 //  https://github.com/silentsokolov/django-admin-rangefilter/issues/21
 
 // Make a promise out of script embed
+{% endcomment %}
 function embedScript(url) {
     return new Promise(function pr(resolve, reject) {
         var newScript = document.createElement("script");
@@ -138,7 +140,5 @@ django.jQuery('document').ready(function () {
     </form>
 </div>
 
-<!--
-JS not requiring template variables refactored as an iife
--->
+{% comment %} JS not requiring template variables refactored as an iife {% endcomment %}
 <script type="text/javascript" src="{% static 'rangefilter/iife.js' %}"></script>