diff --git a/spec/runtime/parser_spec.cc b/spec/runtime/parser_spec.cc
index 22f78a32..11dbccb4 100644
--- a/spec/runtime/parser_spec.cc
+++ b/spec/runtime/parser_spec.cc
@@ -1,5 +1,6 @@
 #include "runtime/runtime_spec_helper.h"
 #include "runtime/helpers/spy_reader.h"
+#include "runtime/helpers/log_debugger.h"
 
 extern "C" const TSLanguage * ts_language_json();
 extern "C" const TSLanguage * ts_language_javascript();
@@ -295,6 +296,27 @@ describe("Parser", [&]() {
         });
       });
 
+      describe("fixing an error", [&]() {
+        it("doesn't try to reuse the error node", [&]() {
+          ts_document_set_language(doc, ts_language_javascript());
+          set_text(
+              "var y = z\n"
+              "var x = y;");
+
+          AssertThat(ts_node_string(root), Equals(
+              "(DOCUMENT (program "
+                  "(var_declaration (var_assignment (identifier) (identifier))) "
+                  "(var_declaration (var_assignment (identifier) (identifier)))))"));
+
+          ts_document_set_debugger(doc, log_debugger_make());
+
+          delete_text(strlen("var y = "), 1);
+
+          AssertThat(ts_node_string(root), Equals(
+              "(DOCUMENT (var_declaration (ERROR 'x')))"));
+        });
+      });
+
       describe("into the middle of an existing token", [&]() {
         before_each([&]() {
           set_text("abc * 123");
diff --git a/src/runtime/parser.c b/src/runtime/parser.c
index 42a1a008..8ca42969 100644
--- a/src/runtime/parser.c
+++ b/src/runtime/parser.c
@@ -103,7 +103,7 @@ static TSTree *break_down_right_stack(TSParser *parser) {
       return NULL;
 
     TSParseAction action = get_action(parser->language, state, node->symbol);
-    bool is_usable = (action.type != TSParseActionTypeError);
+    bool is_usable = (action.type != TSParseActionTypeError) && (node->symbol != ts_builtin_sym_error);
     if (is_usable && right_subtree_start == current_position.chars) {
       ts_stack_shrink(&parser->right_stack, parser->right_stack.size - 1);
       return node;
@@ -138,7 +138,8 @@ static TSTree *get_next_node(TSParser *parser, TSStateId lex_state) {
 
     parser->lexer.lookahead = 0;
     parser->lexer.lookahead_size = 0;
-    parser->lexer.current_position =
+    parser->lexer.token_start_position = ts_length_add(parser->lexer.current_position, node->padding);
+    parser->lexer.token_end_position = parser->lexer.current_position =
         ts_length_add(parser->lexer.current_position, ts_tree_total_size(node));
   } else {
     node = parser->language->lex_fn(&parser->lexer, lex_state);