diff --git a/gravity.lp b/gravity.lp
index d3eb9d8e02..f0d0bbd858 100644
--- a/gravity.lp
+++ b/gravity.lp
@@ -27,5 +27,5 @@ mg.include('scripts/lua/header_authenticated.lp','r')
 <button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
 <pre id="output" class="d-none"></pre>
 
-<script src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/gravity.js')?>" defer></script>
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/groups-clients.lp b/groups-clients.lp
index 32ceb6cba0..019910d7c7 100644
--- a/groups-clients.lp
+++ b/groups-clients.lp
@@ -95,10 +95,10 @@ mg.include('scripts/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/groups-domains.lp b/groups-domains.lp
index 7c31ff8fbe..fffa629e9d 100644
--- a/groups-domains.lp
+++ b/groups-domains.lp
@@ -156,9 +156,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/groups-lists.lp b/groups-lists.lp
index b82204ea6f..442d9f8e96 100644
--- a/groups-lists.lp
+++ b/groups-lists.lp
@@ -94,9 +94,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/groups.lp b/groups.lp
index 06db01dabc..d620291293 100644
--- a/groups.lp
+++ b/groups.lp
@@ -79,9 +79,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/groups.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/index.lp b/index.lp
index a4c8a5775b..1ede13db41 100644
--- a/index.lp
+++ b/index.lp
@@ -279,7 +279,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
 </div>
 <!-- /.row -->
 
-<script src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/index.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/charts.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/index.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/interfaces.lp b/interfaces.lp
index 2e1d55b5e8..774cc4890c 100644
--- a/interfaces.lp
+++ b/interfaces.lp
@@ -30,5 +30,5 @@ mg.include('scripts/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/js/interfaces.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/interfaces.js')?>" defer></script>
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/login.lp b/login.lp
index c965c064fc..66f6263057 100644
--- a/login.lp
+++ b/login.lp
@@ -122,7 +122,7 @@ mg.include('scripts/lua/header.lp','r')
         <strong><a href="https://pi-hole.net/donate/" rel="noopener noreferrer" target="_blank"><i class="fa fa-heart text-red"></i> Donate</a></strong> if you found this useful.
     </div>
 </div>
-<script src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/login.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/footer.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/login.js')?>" defer></script>
 </body>
 </html>
diff --git a/messages.lp b/messages.lp
index 239689584b..0b2b39cd48 100644
--- a/messages.lp
+++ b/messages.lp
@@ -41,6 +41,6 @@ mg.include('scripts/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/js/messages.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/messages.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/network.lp b/network.lp
index 7554522170..cfd86813af 100644
--- a/network.lp
+++ b/network.lp
@@ -64,7 +64,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
 </div>
 <!-- /.row -->
 
-<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/network.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/network.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/queries.lp b/queries.lp
index dd07cfd0fa..ca4ca473cb 100644
--- a/queries.lp
+++ b/queries.lp
@@ -196,9 +196,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
 </div>
 <!-- /.row -->
 
-<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/daterangepicker/daterangepicker.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/queries.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/daterangepicker/daterangepicker.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/queries.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/scripts/lua/footer.lp b/scripts/lua/footer.lp
index 81c05b1b0b..3770cdeac4 100644
--- a/scripts/lua/footer.lp
+++ b/scripts/lua/footer.lp
@@ -66,7 +66,7 @@ end
 
 </div>
 <!-- ./wrapper -->
-<script src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/footer.js')?>" defer></script>
 
 <div id="advanced-info-data" style="display: none;" data-starttime="<?=starttime?>" data-endtime="<?=mg.time(true)?>" data-client-ip="<?=mg.request_info.remote_addr?>" data-xff="<?=x_forwarded_for?>"></div>
 </body>
diff --git a/scripts/lua/header.lp b/scripts/lua/header.lp
index 860a1d6fdc..e808b678ec 100644
--- a/scripts/lua/header.lp
+++ b/scripts/lua/header.lp
@@ -128,8 +128,8 @@ is_authenticated = mg.request_info.is_authenticated
     <noscript><link rel="stylesheet" href="<?=pihole.fileversion('vendor/js-warn/js-warn.css')?>"></noscript>
 
     <!-- scripts -->
-    <script src="<?=pihole.fileversion('vendor/jquery/jquery.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/bootstrap/js/bootstrap.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/adminLTE/adminlte.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/nprogress/nprogress.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/js/utils.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/jquery/jquery.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/bootstrap/js/bootstrap.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/adminLTE/adminlte.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/nprogress/nprogress.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('scripts/js/utils.js')?>" defer></script>
diff --git a/scripts/lua/header_authenticated.lp b/scripts/lua/header_authenticated.lp
index c544cf7a24..e4d5b426ab 100644
--- a/scripts/lua/header_authenticated.lp
+++ b/scripts/lua/header_authenticated.lp
@@ -9,20 +9,20 @@
 ]]--
 mg.include('header.lp','r')
 ?>
-    <script src="<?=pihole.fileversion('vendor/bootstrap-notify/bootstrap-notify.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/select2/select2.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/datatables/datatables.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/datatables-select/datatables.select.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/datatables-buttons/datatables.buttons.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/chartjs/chart.umd.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/chartjs-plugin-deferred/chartjs-plugin-deferred.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/moment/moment.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/chartjs-adapter-moment/chartjs-adapter-moment.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/hammer/hammer.min.js')?>"></script> <!-- Needed for chartjs-plugin-zoom -->
-    <script src="<?=pihole.fileversion('vendor/chartjs-plugin-zoom/chartjs-plugin-zoom.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/bstreeview/bstreeview.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('vendor/waitMe-js/modernized-waitme-min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/js/logout.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/bootstrap-notify/bootstrap-notify.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/select2/select2.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/datatables/datatables.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/datatables-select/datatables.select.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/datatables-buttons/datatables.buttons.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/chartjs/chart.umd.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/chartjs-plugin-deferred/chartjs-plugin-deferred.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/moment/moment.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/chartjs-adapter-moment/chartjs-adapter-moment.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/hammer/hammer.min.js')?>" defer></script> <!-- Needed for chartjs-plugin-zoom -->
+    <script src="<?=pihole.fileversion('vendor/chartjs-plugin-zoom/chartjs-plugin-zoom.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/bstreeview/bstreeview.min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('vendor/waitMe-js/modernized-waitme-min.js')?>" defer></script>
+    <script src="<?=pihole.fileversion('scripts/js/logout.js')?>" defer></script>
 </head>
 <body class="<?=theme.name?> hold-transition sidebar-mini <? if pihole.boxedlayout() then ?>layout-boxed<? end ?> logged-in page-<?=pihole.format_path(scriptname)?>" data-apiurl="<?=pihole.api_url()?>" data-webhome="<?=webhome?>">
 <noscript>
diff --git a/search.lp b/search.lp
index d6a2640ff2..e7e209ed3a 100644
--- a/search.lp
+++ b/search.lp
@@ -47,5 +47,5 @@ mg.include('scripts/lua/header_authenticated.lp','r')
 
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="<?=pihole.fileversion('scripts/js/search.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/search.js')?>" defer></script>
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-all.lp b/settings-all.lp
index b7ddcd0221..1619133420 100644
--- a/settings-all.lp
+++ b/settings-all.lp
@@ -32,8 +32,8 @@ mg.include('scripts/lua/settings_header.lp','r')
         <button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
     </div>
 </div>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings-advanced.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-advanced.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-api.lp b/settings-api.lp
index 493c315d4d..92b5461e71 100644
--- a/settings-api.lp
+++ b/settings-api.lp
@@ -250,10 +250,10 @@ mg.include('scripts/lua/settings_header.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/qrious/qrious.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings-api.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/qrious/qrious.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-api.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-dhcp.lp b/settings-dhcp.lp
index 6ee2f8dfa1..82fccf8395 100644
--- a/settings-dhcp.lp
+++ b/settings-dhcp.lp
@@ -224,9 +224,9 @@ mg.include('scripts/lua/settings_header.lp','r')
         <button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
     </div>
 </div>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings-dhcp.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dhcp.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-dns.lp b/settings-dns.lp
index 547fde8bf9..464746d2cb 100644
--- a/settings-dns.lp
+++ b/settings-dns.lp
@@ -236,8 +236,8 @@ mg.include('scripts/lua/settings_header.lp','r')
         <button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
     </div>
 </div>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings-dns.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dns.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-dnsrecords.lp b/settings-dnsrecords.lp
index 92ceaa1d2f..97e980797c 100644
--- a/settings-dnsrecords.lp
+++ b/settings-dnsrecords.lp
@@ -105,10 +105,10 @@ mg.include('scripts/lua/settings_header.lp','r')
         </div>
     </div>
 </div>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings-dns-records.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dns-records.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-privacy.lp b/settings-privacy.lp
index 2f905c5297..cff11324ee 100644
--- a/settings-privacy.lp
+++ b/settings-privacy.lp
@@ -104,8 +104,8 @@ mg.include('scripts/lua/settings_header.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings-privacy.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-privacy.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-system.lp b/settings-system.lp
index 171ad73a6e..da67581ea7 100644
--- a/settings-system.lp
+++ b/settings-system.lp
@@ -268,10 +268,10 @@ mg.include('scripts/lua/settings_header.lp','r')
         </div>
     </div>
 </div>
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings-system.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/charts.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-system.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-teleporter.lp b/settings-teleporter.lp
index 84d2b0f1e2..5ff7a04315 100644
--- a/settings-teleporter.lp
+++ b/settings-teleporter.lp
@@ -101,8 +101,8 @@ mg.include('scripts/lua/settings_header.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings-teleporter.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-teleporter.js')?>" defer></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/taillog.lp b/taillog.lp
index 4e1c5c7163..0546f958ff 100644
--- a/taillog.lp
+++ b/taillog.lp
@@ -33,6 +33,6 @@ mg.include('scripts/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/js/taillog.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/taillog.js')?>" defer></script>
 
 <? mg.include('scripts/lua/footer.lp','r')?>