diff --git a/src/coffee/models/parser_versions/command_parser_version_base.coffee b/src/coffee/models/parser_versions/command_parser_version_base.coffee
index c9b29050d..f6a1efd32 100644
--- a/src/coffee/models/parser_versions/command_parser_version_base.coffee
+++ b/src/coffee/models/parser_versions/command_parser_version_base.coffee
@@ -125,6 +125,7 @@ module.exports = class CommandParserVersionBase
 
         shortestIndent = Number.MAX_VALUE
         for hereDocLine in hereDocLines
+            continue if hereDocLine.trim().length is 0
             shortestIndent = Math.min hereDocLine.match(/( *).*/)[1].length, shortestIndent
 
         for i in [0...hereDocLines.length]
diff --git a/src/coffee/test/parser_versions/command_parser_version_base.test.coffee b/src/coffee/test/parser_versions/command_parser_version_base.test.coffee
index 6cfe148a7..08d50bee5 100644
--- a/src/coffee/test/parser_versions/command_parser_version_base.test.coffee
+++ b/src/coffee/test/parser_versions/command_parser_version_base.test.coffee
@@ -40,9 +40,9 @@ describe 'command_parser_version_base.coffee', ->
             expect(result[1]).to.be.null
 
         it 'trims smallest leading whitespace', ->
-            parser._lines = ['command: <<-END', '  alpha', '    bravo', '  charlie', 'END', 'command1: arg2']
+            parser._lines = ['command: <<-END', '  alpha', '    bravo', '', '  charlie', 'END', 'command1: arg2']
             parser._lineNumber = 1
 
             result = parser._parseHereDoc parser._lines[0]
             result[0].should.equal 'command: '
-            result[1].should.equal 'alpha\n  bravo\ncharlie'
+            result[1].should.equal 'alpha\n  bravo\n\ncharlie'