diff --git a/mysql-test/suite/galera/r/MDEV-35852.result b/mysql-test/suite/galera/r/MDEV-35852.result
new file mode 100644
index 00000000000..f9d07043cf9
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-35852.result
@@ -0,0 +1,8 @@
+connection node_2;
+connection node_1;
+CREATE TABLE t (a INT) ENGINE=InnoDB;
+INSERT DELAYED INTO t VALUES ();
+ERROR HY000: DELAYED option not supported for table 't'
+DROP TABLE t;
+INSERT DELAYED t1 () VALUES ();
+ERROR 42S02: Table 'test.t1' doesn't exist
diff --git a/mysql-test/suite/galera/t/MDEV-35852.cnf b/mysql-test/suite/galera/t/MDEV-35852.cnf
new file mode 100644
index 00000000000..ebd79612b81
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35852.cnf
@@ -0,0 +1,4 @@
+!include ../galera_2nodes.cnf
+
+[mysqld]
+wsrep-debug=1
diff --git a/mysql-test/suite/galera/t/MDEV-35852.test b/mysql-test/suite/galera/t/MDEV-35852.test
new file mode 100644
index 00000000000..6dce2974dd4
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35852.test
@@ -0,0 +1,9 @@
+--source include/galera_cluster.inc
+
+CREATE TABLE t (a INT) ENGINE=InnoDB;
+--error ER_DELAYED_NOT_SUPPORTED
+INSERT DELAYED INTO t VALUES ();
+DROP TABLE t;
+
+--error ER_NO_SUCH_TABLE
+INSERT DELAYED t1 () VALUES ();
diff --git a/sql/handler.cc b/sql/handler.cc
index 50bcf86f25c..a6e5043a636 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2158,8 +2158,10 @@ int ha_rollback_trans(THD *thd, bool all)
         my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
         error=1;
 #ifdef WITH_WSREP
-        WSREP_WARN("handlerton rollback failed, thd %lld %lld conf %d SQL %s",
+        WSREP_WARN("handlerton rollback failed, thd %lld %lld "
+                   "conf %d wsrep_err %s SQL %s",
                    thd->thread_id, thd->query_id, thd->wsrep_trx().state(),
+                   wsrep::to_c_string(thd->wsrep_cs().current_error()),
                    thd->query());
 #endif /* WITH_WSREP */
       }
@@ -2172,11 +2174,12 @@ int ha_rollback_trans(THD *thd, bool all)
   }
 
 #ifdef WITH_WSREP
-  if (thd->is_error())
+  if (WSREP(thd) && thd->is_error())
   {
-    WSREP_DEBUG("ha_rollback_trans(%lld, %s) rolled back: %s: %s; is_real %d",
-                thd->thread_id, all?"TRUE":"FALSE", wsrep_thd_query(thd),
-                thd->get_stmt_da()->message(), is_real_trans);
+    WSREP_DEBUG("ha_rollback_trans(%lld, %s) rolled back: msg %s is_real %d wsrep_err %s",
+                thd->thread_id, all? "TRUE" : "FALSE",
+                thd->get_stmt_da()->message(), is_real_trans,
+                wsrep::to_c_string(thd->wsrep_cs().current_error()));
   }
 
   // REPLACE|INSERT INTO ... SELECT uses TOI in consistency check
diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc
index 6aab1bec99b..d1e0260d53c 100644
--- a/sql/service_wsrep.cc
+++ b/sql/service_wsrep.cc
@@ -1,4 +1,4 @@
-/* Copyright 2018-2024 Codership Oy <info@codership.com>
+/* Copyright 2018-2025 Codership Oy <info@codership.com>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -86,7 +86,9 @@ extern "C" const char *wsrep_thd_query(const THD *thd)
         return "SET PASSWORD";
       /* fallthrough */
     default:
+    {
       return (thd->query() ? thd->query() : "NULL");
+    }
   }
   return "NULL";
 }
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 2a978640122..0182ca0ee1b 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2421,6 +2421,7 @@ public:
     delayed_insert_threads--;
 
     my_free(thd.query());
+    thd.reset_query_inner();
     thd.security_ctx->user= 0;
     thd.security_ctx->host= 0;
   }