diff --git a/layouts/partials/highlight-js.html b/layouts/partials/highlight-js.html
index 6f5e1ac..450bb88 100644
--- a/layouts/partials/highlight-js.html
+++ b/layouts/partials/highlight-js.html
@@ -1,13 +1,12 @@
-{{ if (isset .Params "highlight") }}
+{{- if (.Site.Params.highlightjs) -}}
+{{ if or (not (isset .Params "highlight")) (and (isset .Params "highlight") .Params.highlight) }}
     {{ $.Scratch.Set "hl_languages" (union (.Site.Params.highlightjslanguages) (.Params.highlightjslanguages)) }}
-    {{ if (.Site.Params.highlightjs) }}
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/highlight.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/highlight.min.js"></script>
         {{ with $.Scratch.Get "hl_languages" }}
             {{ range . }}
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/languages/{{.}}.min.js"></script>
             {{ end }}
         {{ end }}
-    {{ end }}
     <script type="text/javascript">
         {{ with $.Scratch.Get "hl_languages" }}
         hljs.configure({languages: [{{(delimit . ", ")}}]});
@@ -16,3 +15,4 @@
     </script>
     {{ $.Scratch.Delete "hl_languages" }}
 {{ end }}
+{{- end -}}