diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index 26f3fa3c8c7d7..11664c14dbfa6 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -700,6 +700,15 @@ public static function highlighter(array $terms, $start = 'highlighter-start', $
 			return;
 		}
 
+		$terms = array_filter($terms, 'strlen');
+
+		// Nothing to Highlight
+		if (empty($terms))
+		{
+			static::$loaded[__METHOD__][$sig] = true;
+			return;
+		}
+
 		// Include core
 		static::core();