diff --git a/mysql-test/suite/galera_sr/r/MENT-2038.result b/mysql-test/suite/galera_sr/r/MENT-2038.result
new file mode 100644
index 00000000000..bbd7c568925
--- /dev/null
+++ b/mysql-test/suite/galera_sr/r/MENT-2038.result
@@ -0,0 +1,7 @@
+connection node_2;
+connection node_1;
+SET SESSION wsrep_on=OFF;
+BEGIN;
+BEGIN;
+COMMIT;
+SET SESSION wsrep_on=ON;
diff --git a/mysql-test/suite/galera_sr/t/MENT-2038.test b/mysql-test/suite/galera_sr/t/MENT-2038.test
new file mode 100644
index 00000000000..311b0d3a36f
--- /dev/null
+++ b/mysql-test/suite/galera_sr/t/MENT-2038.test
@@ -0,0 +1,12 @@
+#
+# MENT-2038: Assertion `(thd && (WSREP_PROVIDER_EXISTS_ && thd->variables.wsrep_on))'
+# failed in void wsrep_restore_kill_after_commit(THD*)
+#
+
+--source include/galera_cluster.inc
+
+SET SESSION wsrep_on=OFF;
+BEGIN;
+BEGIN; # If bug is present, assertion triggers during implicit commit
+COMMIT;
+SET SESSION wsrep_on=ON;
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc
index 1c51d05c56a..2c2e3a0e44d 100644
--- a/sql/wsrep_thd.cc
+++ b/sql/wsrep_thd.cc
@@ -496,7 +496,7 @@ void wsrep_backup_kill_for_commit(THD *thd)
 
 void wsrep_restore_kill_after_commit(THD *thd)
 {
-  DBUG_ASSERT(WSREP(thd));
+  DBUG_ASSERT(wsrep_is_active(thd));
   mysql_mutex_assert_owner(&thd->LOCK_thd_kill);
   thd->killed= thd->wsrep_abort_by_kill;
   my_free(thd->killed_err);