diff --git a/components/engine/builder/parser/parser.go b/components/engine/builder/parser/parser.go
index c24a925e43..0061779201 100644
--- a/components/engine/builder/parser/parser.go
+++ b/components/engine/builder/parser/parser.go
@@ -98,7 +98,12 @@ func Parse(rwc io.Reader) (*Node, error) {
 	scanner := bufio.NewScanner(rwc)
 
 	for scanner.Scan() {
-		line, child, err := parseLine(strings.TrimLeftFunc(scanner.Text(), unicode.IsSpace))
+		scannedLine := strings.TrimLeftFunc(scanner.Text(), unicode.IsSpace)
+		if stripComments(scannedLine) == "" {
+			continue
+		}
+
+		line, child, err := parseLine(scannedLine)
 		if err != nil {
 			return nil, err
 		}
@@ -107,7 +112,7 @@ func Parse(rwc io.Reader) (*Node, error) {
 			for scanner.Scan() {
 				newline := scanner.Text()
 
-				if newline == "" {
+				if stripComments(strings.TrimSpace(newline)) == "" {
 					continue
 				}
 
diff --git a/components/engine/builder/parser/testfiles/continueIndent/Dockerfile b/components/engine/builder/parser/testfiles/continueIndent/Dockerfile
index 6ce6c06fb7..454fdcc628 100644
--- a/components/engine/builder/parser/testfiles/continueIndent/Dockerfile
+++ b/components/engine/builder/parser/testfiles/continueIndent/Dockerfile
@@ -26,3 +26,10 @@ frog
 RUN echo good\
 bye\
 frog
+
+RUN echo hello \
+# this is a comment
+
+# this is a comment with a blank line surrounding it
+
+this is some more useful stuff
diff --git a/components/engine/builder/parser/testfiles/continueIndent/result b/components/engine/builder/parser/testfiles/continueIndent/result
index e440b836d4..9605558106 100644
--- a/components/engine/builder/parser/testfiles/continueIndent/result
+++ b/components/engine/builder/parser/testfiles/continueIndent/result
@@ -7,3 +7,4 @@
 (run "echo hi   world  goodnight")
 (run "echo goodbyefrog")
 (run "echo goodbyefrog")
+(run "echo hello this is some more useful stuff")
diff --git a/components/engine/builder/parser/testfiles/escapes/Dockerfile b/components/engine/builder/parser/testfiles/escapes/Dockerfile
index 87a8e028a2..1ffb17ef08 100644
--- a/components/engine/builder/parser/testfiles/escapes/Dockerfile
+++ b/components/engine/builder/parser/testfiles/escapes/Dockerfile
@@ -5,4 +5,10 @@ RUN apt-get \update && \
   apt-get \"install znc -y
 ADD \conf\\" /.znc
 
+RUN foo \
+
+bar \
+
+baz
+
 CMD [ "\/usr\\\"/bin/znc", "-f", "-r" ]
diff --git a/components/engine/builder/parser/testfiles/escapes/result b/components/engine/builder/parser/testfiles/escapes/result
index ffeb2a8960..13e409cb1a 100644
--- a/components/engine/builder/parser/testfiles/escapes/result
+++ b/components/engine/builder/parser/testfiles/escapes/result
@@ -2,4 +2,5 @@
 (maintainer "Erik \\\\Hollensbe <erik@hollensbe.org>\\\"")
 (run "apt-get \\update &&   apt-get \\\"install znc -y")
 (add "\\conf\\\\\"" "/.znc")
+(run "foo bar baz")
 (cmd "/usr\\\"/bin/znc" "-f" "-r")