diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 6deb45ed27..597aeb6b40 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -659,8 +659,10 @@ static void handle_unknown_csi(TermInput *input, const TermKeyKey *key)
     case '?':
       // Primary Device Attributes (DA1) response
       if (input->callbacks.primary_device_attr) {
-        input->callbacks.primary_device_attr(input->tui_data);
+        void (*cb_save)(TUIData *) = input->callbacks.primary_device_attr;
+        // Clear the callback before invoking it, as it may set a new callback. #34031
         input->callbacks.primary_device_attr = NULL;
+        cb_save(input->tui_data);
       }
 
       break;
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 2b25fb4738..41994cc935 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -360,6 +360,7 @@ static void terminfo_start(TUIData *tui)
   tui->overflow = false;
   tui->set_cursor_color_as_str = false;
   tui->cursor_has_color = false;
+  tui->did_set_grapheme_cluster_mode = false;
   tui->showing_mode = SHAPE_IDX_N;
   tui->unibi_ext.enable_mouse = -1;
   tui->unibi_ext.disable_mouse = -1;