diff --git a/_includes/js-selector.html b/_includes/js-selector.html
index ec5c9a8..62a36e6 100644
--- a/_includes/js-selector.html
+++ b/_includes/js-selector.html
@@ -8,38 +8,34 @@
 
 {% if page.layout == 'home' %}
 
-  <script src="{{ '/assets/js/home.min.js' | relative_url }}" async></script>
+  <script async src="{{ '/assets/js/home.min.js' | relative_url }}"></script>
 
 {% elsif page.layout == 'post' %}
 
-  <script src="{{ '/assets/js/post.min.js' | relative_url }}" async></script>
+  <script async src="{{ '/assets/js/post.min.js' | relative_url }}"></script>
 
   {% if page.math %}
     <!-- MathJax -->
     <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
-    <script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js" async></script>
+    <script async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
   {% endif %}
 
 {% elsif page.layout == 'page' %}
 
   {% if page.type == 'categories' %}
-    <script src="{{ '/assets/js/categories.min.js' | relative_url }}" async></script>
+    <script async src="{{ '/assets/js/categories.min.js' | relative_url }}"></script>
   {% else %}
-    <script src="{{ '/assets/js/page.min.js' | relative_url }}" async></script>
+    <script async src="{{ '/assets/js/page.min.js' | relative_url }}"></script>
   {% endif %}
 
 {% else %}
 
-  <script src="{{ '/assets/js/page.min.js' | relative_url }}" async></script>
+  <script async src="{{ '/assets/js/page.min.js' | relative_url }}"></script>
 
 {% endif %}
 
 
 {% if jekyll.environment == 'production' %}
-
-  {% include google-analytics.html %}
-
   <!-- PWA -->
-  <script src="{{ '/app.js' | relative_url }}" defer></script>
-
+  <script defer src="{{ '/app.js' | relative_url }}"></script>
 {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 03047bf..4b4b34c 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -54,6 +54,10 @@ layout: compress
 
     {% include search-loader.html %}
 
+    {% if site.google_analytics.id and jekyll.environment == 'production' %}
+      {% include google-analytics.html %}
+    {% endif %}
+
   </body>
 
 </html>