diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index d1fcbcc29..bb15805e1 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -1482,13 +1482,10 @@ class EditorView extends View
       html = @buildEmptyLineHtml(showIndentGuide, eolInvisibles, htmlEolInvisibles, indentation, editor, mini)
       line.push(html) if html
     else
-      firstNonWhitespacePosition = text.search(/\S/)
-      firstTrailingWhitespacePosition = text.search(/\s*$/)
-      lineIsWhitespaceOnly = firstTrailingWhitespacePosition is 0
       position = 0
       for token in tokens
         @updateScopeStack(line, scopeStack, token.scopes)
-        hasIndentGuide = not mini and showIndentGuide and (hasLeadingWhitespace or lineIsWhitespaceOnly)
+        hasIndentGuide = not mini and showIndentGuide
         line.push(token.getValueAsHtml({invisibles, hasIndentGuide}))
         position += token.value.length