diff --git a/plugins/tiddlywiki/highlight/TypeMappings.multids b/plugins/tiddlywiki/highlight/TypeMappings.multids
index 0bf0ef87e..9e07d07bd 100644
--- a/plugins/tiddlywiki/highlight/TypeMappings.multids
+++ b/plugins/tiddlywiki/highlight/TypeMappings.multids
@@ -1,6 +1,5 @@
 title: $:/config/HighlightPlugin/TypeMappings/
 
-text/plain:
 application/javascript: javascript
 application/json: json
 text/css: css
diff --git a/plugins/tiddlywiki/highlight/highlightblock.js b/plugins/tiddlywiki/highlight/highlightblock.js
index e5049936b..22ba0d7d0 100644
--- a/plugins/tiddlywiki/highlight/highlightblock.js
+++ b/plugins/tiddlywiki/highlight/highlightblock.js
@@ -27,7 +27,7 @@ CodeBlockWidget.prototype.postRender = function() {
 	if(tiddler) {
 		language = tiddler.fields.text || "";
 	}
-	if(language) {
+	if(language && hljs.listLanguages().indexOf(language) !== -1) {
 		domNode.className = language.toLowerCase() + " hljs";
 		if($tw.browser && !domNode.isTiddlyWikiFakeDom) {
 			hljs.highlightBlock(domNode);