diff --git a/parser/parser_test.go b/parser/parser_test.go
index ca2fddd7c..f216781a8 100644
--- a/parser/parser_test.go
+++ b/parser/parser_test.go
@@ -554,6 +554,10 @@ var shellTests = []struct {
 		"<<EOF\n$(()a",
 		`2:1: reached EOF without matching $(( with ))`,
 	},
+	{
+		"<<EOF\n`))",
+		`2:2: ) can only be used to close a subshell`,
+	},
 	{
 		"echo ${foo",
 		`1:6: reached EOF without matching ${ with }`,
diff --git a/parser/tokenizer.go b/parser/tokenizer.go
index 9e1774410..357efebff 100644
--- a/parser/tokenizer.go
+++ b/parser/tokenizer.go
@@ -126,6 +126,9 @@ skipSpace:
 			p.newLine = true
 			if len(p.heredocs) > p.buriedHdocs {
 				p.doHeredocs()
+				if p.tok == token.EOF {
+					return
+				}
 			}
 		case '\\':
 			if p.npos < len(p.src)-1 && p.src[p.npos+1] == '\n' {