diff --git a/package.json b/package.json
index f618e6f4d..7740d54f6 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "build": "npm-run-all clean html-build css js",
     "bundlesize": "bundlesize",
     "browsersync": "node build/browsersync.js",
-    "html-watch": "JEKYLL_ENV=development bundle exec jekyll build --watch",
+    "html-watch": "JEKYLL_ENV=development bundle exec jekyll build --watch --incremental",
     "html-build": "JEKYLL_ENV=production bundle exec jekyll build --destination dist-html",
     "lint": "npm-run-all --parallel js-lint css-lint",
     "clean": "rm -rf dist && mkdir dist && mkdir dist/css && mkdir dist/js",
diff --git a/pages/_includes/js/charts.html b/pages/_includes/js/charts.html
index 9a2314707..56cff6889 100644
--- a/pages/_includes/js/charts.html
+++ b/pages/_includes/js/charts.html
@@ -5,10 +5,10 @@
 {% if data %}
 <script>
 document.addEventListener("DOMContentLoaded", function(event) {
-   window.chart = window.chart || {};
+    {% if jekyll.environment == 'development' %}window.chart = window.chart || {};{% endif %}
    
    var el;
-   window.ApexCharts && (window.chart["{{ include.chart-id }}"] = new ApexCharts((el = document.getElementById('{{ include.id }}')), {
+   window.ApexCharts && ({% if jekyll.environment == 'development' %}window.chart["{{ include.chart-id }}"] = {% endif %}new ApexCharts((el = document.getElementById('{{ include.id }}')), {
       chart: {
          type: '{{ data.type }}',
          height: el.offsetHeight,