diff --git a/includes/class-gistpress.php b/includes/class-gistpress.php
index 62b6a0b..2cda5dc 100644
--- a/includes/class-gistpress.php
+++ b/includes/class-gistpress.php
@@ -495,12 +495,14 @@ public function process_gist_html( $html, array $args ) {
 				//$classes[] = ( $key % 2 ) ? 'line-odd' : 'line-even';
 				$style = '';
 
-				if ( isset( $highlight[ $key + 1 ] ) ) {
+				if ( isset( $highlight[$key + 1] ) ) {
 					$classes[] = 'line-highlight';
 
 					if ( ! empty( $args['highlight_color'] ) ) {
 						$style = ' style="background-color: ' . $args['highlight_color'] . ' !important"';
 					}
+				} elseif ( ! empty( $args['highlight'] ) ) {
+					$classes[] = 'line-no-highlight';
 				}
 
 				/**