diff --git a/layouts/partials/highlight-js.html b/layouts/partials/highlight-js.html
index 5a0eea9..0606d79 100644
--- a/layouts/partials/highlight-js.html
+++ b/layouts/partials/highlight-js.html
@@ -1,15 +1,18 @@
{{ if .Site.Params.highlightjs }}
- {{ $hl := newScratch }}
- {{ $hl.Set "languages" .Site.Params.highlightjslanguages }}
-
- {{ with $hl.Get "languages" }}
- {{ range . }}
-
+ {{ if or (not (isset .Params "highlight")) (not .Params.highlight) }}
+ {{ $hl := newScratch }}
+ {{ $hl.Set "languages" (union (.Site.Params.highlightjslanguages) (.Params.highlightjslanguages)) }}
+
+ {{ with $hl.Get "languages" }}
+ {{ range . }}
+
+ {{ end }}
+
{{ end }}
- {{ end }}
-
- {{ $hl.Delete "languages" }}
+
+ {{ $hl.Delete "languages" }}
+ {{ end }}
{{ end }}